From cd14d8ef69189fc6e9d677d2df075cbf4249875e Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Fri, 29 Aug 2003 03:08:03 +0000 Subject: [PATCH] Fix problems in the GroupList. (fixes bug# 781647) --- stepmania/Themes/default/metrics.ini | 6 +++--- stepmania/src/GroupList.cpp | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 0d82fccbd8..bcecbe35d4 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -469,7 +469,7 @@ ContentsOnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 ContentsOffCommand=linear,0.5;diffusealpha,0 GroupListX=504 GroupListY=200 -GroupListOnCommand= +GroupListOnCommand=addx,400;sleep,0.2;addx,-400 GroupListOffCommand= MusicListX=20 MusicListY=276 @@ -485,9 +485,9 @@ StartX=0 StartY=-136 SpacingX=0 SpacingY=28 -GainFocusCommand=stoptweening;glowshift;effectperiod,0.5;linear,0.2;x,-40 +GainFocusCommand=glowshift;effectperiod,0.5;linear,0.2;x,-40 LoseFocusCommand=stoptweening;stopeffect;linear,0.2;x,0 -HideItemCommand=stoptweening;linear,0.2;diffusealpha,0 +HideItemCommand=linear,0.2;diffusealpha,0 ShowItemCommand=stoptweening;linear,0.2;diffusealpha,1;zoom,1.0; # This just selects the type of tweening used for scrolling the list; it shouldn't actually # queue any commands. diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp index 9dc39f6dbe..000a4bd62b 100644 --- a/stepmania/src/GroupList.cpp +++ b/stepmania/src/GroupList.cpp @@ -109,9 +109,6 @@ void GroupList::AfterChange() m_Frame.Command( SCROLL_TWEEN_COMMAND ); m_Frame.SetY( -m_iTop*SPACING_Y ); - m_sprButtons[m_iSelection]->Command( GAIN_FOCUS_COMMAND ); - m_textLabels[m_iSelection]->Command( GAIN_FOCUS_COMMAND ); - for( int i=0; i < (int) m_asLabels.size(); i++ ) { const bool IsHidden = !ItemIsOnScreen(i); @@ -132,6 +129,8 @@ void GroupList::AfterChange() m_bHidden[i] = IsHidden; } + m_sprButtons[m_iSelection]->Command( GAIN_FOCUS_COMMAND ); + m_textLabels[m_iSelection]->Command( GAIN_FOCUS_COMMAND ); } void GroupList::Up()