aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-03-30 19:17:23 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-03-30 19:17:23 +0000
commit162c1ce5d4c68fc6784fd4a8f0b975b857505574 (patch)
treeff6d1de09284d69d3ba0603775caa64beaff504a /Game/Code/Screens
parentcf9ff4fabd3220815b2b800bcb00319703d82d0d (diff)
downloadusdx-162c1ce5d4c68fc6784fd4a8f0b975b857505574.tar.gz
usdx-162c1ce5d4c68fc6784fd4a8f0b975b857505574.tar.xz
usdx-162c1ce5d4c68fc6784fd4a8f0b975b857505574.zip
Fixed a Bug that causes a wrong Category-Title is displayed in SongScreen after a Search without a result.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@55 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
-rw-r--r--Game/Code/Screens/UScreenSongJumpto.pas32
1 files changed, 25 insertions, 7 deletions
diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index 0ba61450..c2107507 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -114,8 +114,17 @@ begin
// Up and Down could be done at the same time,
// but I don't want to declare variables inside
// functions like this one, called so many times
- SDLK_DOWN: SelectNext;
- SDLK_UP: SelectPrev;
+ SDLK_DOWN:
+ begin
+ SelectNext;
+ Button[0].Text[0].Selected := (Interaction = 0);
+ end;
+
+ SDLK_UP:
+ begin
+ SelectPrev;
+ Button[0].Text[0].Selected := (Interaction = 0);
+ end;
SDLK_RIGHT:
begin
@@ -191,12 +200,15 @@ begin
//Reset Screen if no Old Search is Displayed
if (CatSongs.CatNumShow <> -2) then
begin
- Interaction := 0;
SelectType := 0;
Button[0].Text[0].Text := '';
Text[0].Text := NoSongsFound;
end;
+
+ //Select Input
+ Interaction := 0;
+ Button[0].Text[0].Selected := True;
end;
function TScreenSongJumpto.Draw: boolean;
@@ -207,14 +219,20 @@ end;
procedure TScreenSongJumpto.SetTextFound(const Count: Cardinal);
begin
if (Count = 0) then
- Text[0].Text := NoSongsFound
+ begin
+ Text[0].Text := NoSongsFound;
+ ScreenSong.HideCatTL;
+ end
else
+ begin
Text[0].Text := Format(SongsFound, [Count]);
- //Set CatTopLeftText
- ScreenSong.ShowCatTLCustom(Format(CatText, [Button[0].Text[0].Text]));
+ //Set CatTopLeftText
+ ScreenSong.ShowCatTLCustom(Format(CatText, [Button[0].Text[0].Text]));
+ end;
+
- //visSongs setzen
+ //Set visSongs
VisSongs := Count;
//Fix SongSelection