actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explicitly LoadAllCommands. The "load commands in SetXY" hack isn't working well now that more and more Actors are being moved into Lua. That hack should be removed eventually in favor of explicit command loading.

Browse Source
This commit is contained in:
Chris Danford
2007-02-16 07:09:04 +00:00
parent b53362bc95
commit 46ca7f526a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+8 -6
View File
@@ -75,12 +75,14 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
ActorUtil::SetXY( m_textContents[p], sMetricsGroup ); // SetXY loads all commands
ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup );
ActorUtil::SetXY( m_textContents[p], sMetricsGroup );
m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") );
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
ActorUtil::SetXY( m_Labels[p], sMetricsGroup ); // SetXY loads all commands
ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup );
ActorUtil::SetXY( m_Labels[p], sMetricsGroup );
m_ContentsFrame.AddChild( m_Labels[p] );
ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name );
@@ -299,13 +301,13 @@ void PaneDisplay::SetFocus( PaneTypes NewPane )
{
if( g_Contents[i].type == m_CurPane )
{
COMMAND( m_textContents[i], "LoseFocus" );
COMMAND( m_Labels[i], "LoseFocus" );
m_textContents[i].PlayCommand( "LoseFocus" );
m_Labels[i]->PlayCommand( "LoseFocus" );
}
else if( g_Contents[i].type == NewPane )
{
COMMAND( m_textContents[i], "GainFocus" );
COMMAND( m_Labels[i], "GainFocus" );
m_textContents[i].PlayCommand( "GainFocus" );
m_Labels[i]->PlayCommand( "GainFocus" );
}
}