From ec01eba085a84b30ec967d86ca1193f2a9407d16 Mon Sep 17 00:00:00 2001
From: "ardi@ist-einmalig.de" <ardi@ist-einmalig.de>
Date: Sun, 27 Sep 2009 19:04:36 +0000
Subject: [PATCH] * add forgotten pictures * the cross-button in SearchWindow
 now closes the Window

---
 source/images/keyboard_backspace_over.png | Bin 0 -> 1392 bytes
 source/images/keyboard_clear_over.png     | Bin 0 -> 2286 bytes
 source/menu.cpp                           |  34 +++++++++++++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 source/images/keyboard_backspace_over.png
 create mode 100644 source/images/keyboard_clear_over.png

diff --git a/source/images/keyboard_backspace_over.png b/source/images/keyboard_backspace_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..419a2e6c04ec2d24f2db4ca18474e0746c9c0f59
GIT binary patch
literal 1392
zcmV-$1&{iPP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000XT
z000XT0n*)m`~Uz2B1uF+RCt`tnQdrQbr`^Z&;Oh`w>h0#!kiK=3w!$#D4ZZJ5ek8y
zq9GFWK{E&qgkFr0lKhfHVP)kDp%E39%JMCvS2vU0T0<%ZhS*fhrp~!tcfH%a=lq{O
zoOAE)?&e(Xt>^G?xaXd8&+k0%_kToH$(P1>+yRzES`92<e5D0w2M)wMuch!y$p>tV
z$Cm(a`=<Eb((-Z~$HgB<G6klf7$Du7Bz?W-GhlVh^STECHpb&m0ozNes-3&%&c=w0
zBihi?-P1!`+v$!V2<l><*N_8@EO+FRmO6{>nujq06UnEcHBsg7%U8&BUF-xF#yqdh
zjbd)gnd{=ruAWYxwTJ~K(t?o}6_{FD#@T<UtSRAjV7UuCn#kyaq)a6fD7~3r;=l%z
zlJWzt*eTSIu4|0Pt6kucWZ>X94jris6=@%565=l_?THkw>vA=nc4kgti3{BBi@`Vs
z1<rLPsVXU^$T1TN7APco`$+Wp7-Pt&09xw;B`Sg=1`)^vmiC_1gu>;E2pA)1V1S^+
z1rP)gLBt@F=w1lnj4_A}IYK~@0Xn%dkii8oB8d5a0cJVe+~Me;nPfg&U_k>}I50BU
z-6Pe&_c?i@`IfKmH&DouWej653QS`R@*jI#;QJgsu!ns+wlJr5KKE_)MrA=2i^)sY
zD2t;wEHLk|U_n6R!F}xA@h+Fnp97#~-u%(WutwJ8hFLuP_10RB9j<53ws&Yhcc$>y
z$DoCWZYJNwL_U`&28R+=<)<V2`Qn4kTsZUBkmsCk{hbXfm(kiBXW_$(QB~C1aG%xO
z=WxGq*Pg+MLs`&B6oW$m9{>6vyWf9{^QTV@`|Qa?H?7Ta0De9C-LU6o#h8IDRn=ll
zL79=re1&ze>6@?E{ob3LJ#}(KH@g)XY!J!upgBMjWwPWZ>F?`5XX|S()0Z0GzU&kf
zUTaP0O#w7p2cf?PMcd-Xmb3GRW*%R)hN-2c;|3@Nn~{ODa$cd9yrCh~imF+xT=y!w
zer#dcGixa+n>O}<LlkQU6>7;A>Y?jkMO76mURY1v(`%^Txs3xKe@OCLV$gYW@3@nd
zFTO%+%g@}u=)v%YQR0~>u8c9^J}Snhz{P3@CaW|wH62P6S1y&Z@Necw3T^UQf-iS%
zr~acI^mKRSj^FdZLN@O`GIH|`A!;pY-^cCgWSZZzDRMDUnF*itW?DXd22ZYC$0x^5
zu;Tgklvm8m{rE_(A6AXQ$@64?3^F(dZ>DAC(|O|A=lJyaZ>)N012ZbCMm;QqA=p0=
zNJCT8p=9Z8OHJ7fT-O;@FICl1_hPk5#`hu7L1{X%DVhhzW}+UGVOOGlp5IAA|3?$e
zSlnb3qS4r=0|1TSI!@@~NyQ@?Bn&~+qg?>UaYDcw3=0z})>^DFXkMZ278J(_uJb<t
z6tHRt!u6U?7ibedlS}c!<~@<33MyfV5t{*MbAiK>POb;V$qo#Y1gTb01yRNH_N0Kr
zCgyofl1?@FiK|$vAYcfWLMBR$2qsETwTj<$8DMM7^HSMycD3!i(A{^f3k@ua0!p?V
zjjIAEShWN}K=0MdXrkj!U?U7%0)7bCUsP37SyDL*<7EGa_RCl$kmfB|qKdVOpH7py
za*-g>@e8m#=6P)c03*m+;0>IjI;XT8Q#1vqsCZ1EZX`ip3Y$q2B)igtR@)Twyxc0P
y6uyRtK&uH~L(Bnc$CVKNAbbt+ZT{+hR{jOw!SBSUJ-PV+0000<MNUMnLSTYKJDULj

literal 0
HcmV?d00001

diff --git a/source/images/keyboard_clear_over.png b/source/images/keyboard_clear_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..11fbb9620cb4a9f5b27cff8f91580ac87b073ecd
GIT binary patch
literal 2286
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
IM6N<$f=$yvivR!s

literal 0
HcmV?d00001

diff --git a/source/menu.cpp b/source/menu.cpp
index 6a0c41a1..ec5b2e6f 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1128,18 +1128,44 @@ int MenuDiscList() {
 			
 			
 				__Menu_GetEntries(0, newFilter);
+				menu = MENU_DISCLIST;
+				break;
 			}
-			else if(searchChar == 7) // Clear
+			else if(searchChar == 7) // Close
 			{
-				__Menu_GetEntries(0, L"");
+				show_searchwindow=false;
+				HaltGui();
+				if(searchBar)
+				{
+					mainWindow->Remove(searchBar);
+					delete searchBar;
+					searchBar = NULL;
+				}
+				if(gameFilter && *gameFilter)
+				{
+					searchBtn.SetEffect(EFFECT_PULSE, 10, 105);
+					searchBtn.SetImage(&searchBtnImg);
+					searchBtn.SetImageOver(&searchBtnImg);
+					searchBtn.SetAlpha(255);
+				}
+				else
+				{
+					searchBtn.StopEffect();
+					searchBtn.SetEffectGrow();
+					searchBtn.SetImage(&searchBtnImg_g);
+					searchBtn.SetImageOver(&searchBtnImg_g);
+					searchBtn.SetAlpha(180);
+				}
+				
+				ResumeGui();
 			}
 			else if(searchChar == 8) // Backspace
 			{
 				__Menu_GetEntries(0, gameFilterPrev);
+				menu = MENU_DISCLIST;
+				break;
 			}
 
-			menu = MENU_DISCLIST;
-			break;
 		}
 		
         else if (abcBtn.GetState() == STATE_CLICKED) {