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

fixup XML use

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-10 21:26:57 +00:00
parent 727f4cfcc1
commit bdb7b58250
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+6 -4
View File
@@ -76,11 +76,13 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") ); m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup );
ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup, this ); ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup, this );
m_ContentsFrame.AddChild( &m_textContents[p] ); m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") ); m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") );
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) ); m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup );
ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup, this ); ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup, this );
m_ContentsFrame.AddChild( m_Labels[p] ); m_ContentsFrame.AddChild( m_Labels[p] );
@@ -92,8 +94,8 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i ) for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i )
{ {
COMMAND( m_textContents[i], "LoseFocus" ); m_textContents[i].PlayCommand( "LoseFocus", this );
COMMAND( m_Labels[i], "LoseFocus" ); m_Labels[i]->PlayCommand( "LoseFocus", this );
m_textContents[i].FinishTweening(); m_textContents[i].FinishTweening();
m_Labels[i]->FinishTweening(); m_Labels[i]->FinishTweening();
} }
@@ -103,8 +105,6 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
void PaneDisplay::LoadFromNode( const RString &sDir, const XNode *pNode ) void PaneDisplay::LoadFromNode( const RString &sDir, const XNode *pNode )
{ {
ActorFrame::LoadFromNode( sDir, pNode );
bool b; bool b;
RString sMetricsGroup; RString sMetricsGroup;
@@ -117,6 +117,8 @@ void PaneDisplay::LoadFromNode( const RString &sDir, const XNode *pNode )
PlayerNumber pn = (PlayerNumber) LuaHelpers::RunExpressionI(sPlayerNumber); PlayerNumber pn = (PlayerNumber) LuaHelpers::RunExpressionI(sPlayerNumber);
Load( sMetricsGroup, pn ); Load( sMetricsGroup, pn );
ActorFrame::LoadFromNode( sDir, pNode );
} }
void PaneDisplay::SetContent( PaneContents c ) void PaneDisplay::SetContent( PaneContents c )