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

fix X for Left and Right lost after call to SetBarWidth

Browse Source
This commit is contained in:
Chris Danford
2008-05-06 02:19:05 +00:00
parent a5d7a0ecdf
commit 5e9f053d4d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionsCursor.cpp
+8 -3
View File
@@ -16,7 +16,9 @@ OptionsCursor::OptionsCursor( const OptionsCursor &cpy ):
ActorFrame( cpy ), ActorFrame( cpy ),
m_sprMiddle( cpy.m_sprMiddle ), m_sprMiddle( cpy.m_sprMiddle ),
m_sprLeft( cpy.m_sprLeft ), m_sprLeft( cpy.m_sprLeft ),
m_sprRight( cpy.m_sprRight ) m_sprRight( cpy.m_sprRight ),
m_iOriginalLeftX( cpy.m_iOriginalLeftX ),
m_iOriginalRightX( cpy.m_iOriginalRightX )
{ {
/* Re-add children, or m_SubActors will point to cpy's children and not our own. */ /* Re-add children, or m_SubActors will point to cpy's children and not our own. */
m_SubActors.clear(); m_SubActors.clear();
@@ -46,6 +48,9 @@ void OptionsCursor::Load( const RString &sMetricsGroup )
LOAD_SPR( m_sprLeft, "Left" ); LOAD_SPR( m_sprLeft, "Left" );
LOAD_SPR( m_sprRight, "Right" ); LOAD_SPR( m_sprRight, "Right" );
#undef LOAD_SPR #undef LOAD_SPR
m_iOriginalLeftX = m_sprLeft->GetX();
m_iOriginalRightX = m_sprRight->GetX();
} }
void OptionsCursorPlus::Load( const RString &sMetricsGroup ) void OptionsCursorPlus::Load( const RString &sMetricsGroup )
@@ -110,8 +115,8 @@ void OptionsCursor::SetBarWidth( int iWidth )
m_sprMiddle->ZoomToWidth( fWidth ); m_sprMiddle->ZoomToWidth( fWidth );
m_sprLeft->SetX( -fWidth/2 ); m_sprLeft->SetX( m_iOriginalLeftX - fWidth/2 );
m_sprRight->SetX( +fWidth/2 ); m_sprRight->SetX( m_iOriginalRightX + fWidth/2 );
} }
void OptionsCursorPlus::SetBarWidth( int iWidth ) void OptionsCursorPlus::SetBarWidth( int iWidth )
stepmania/src/OptionsCursor.h
+2
View File
@@ -25,6 +25,8 @@ protected:
AutoActor m_sprMiddle; AutoActor m_sprMiddle;
AutoActor m_sprLeft; AutoActor m_sprLeft;
AutoActor m_sprRight; AutoActor m_sprRight;
int m_iOriginalLeftX; // save the metrics-set X because it gets oblitterated on a call to SetBarWidth
int m_iOriginalRightX;
}; };
class OptionsCursorPlus : public OptionsCursor class OptionsCursorPlus : public OptionsCursor