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

remove hard-coded positioning of text

Browse Source
This commit is contained in:
Chris Danford
2005-03-20 07:11:23 +00:00
parent 90b8e9cc8a
commit 297a5851ba
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+6
View File
@@ -4212,6 +4212,12 @@ AllowOperatorMenuButton=0
StyleIcon=0 StyleIcon=0
MemoryCardIcons=1 MemoryCardIcons=1
TimerSeconds=-1 TimerSeconds=-1
InputTipsX=SCREEN_LEFT+4
InputTipsY=SCREEN_TOP+40
InputTipsOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
InfoX=SCREEN_RIGHT-114
InfoY=SCREEN_TOP+40
InfoOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
[CatalogXml] [CatalogXml]
ShowPlayModeRegular=1 ShowPlayModeRegular=1
stepmania/src/ScreenEdit.cpp
+10 -16
View File
@@ -73,7 +73,7 @@ const ScreenMessage SM_BackFromStopChange = (ScreenMessage)(SM_User+16);
const ScreenMessage SM_DoSaveAndExit = (ScreenMessage)(SM_User+17); const ScreenMessage SM_DoSaveAndExit = (ScreenMessage)(SM_User+17);
const ScreenMessage SM_DoExit = (ScreenMessage)(SM_User+18); const ScreenMessage SM_DoExit = (ScreenMessage)(SM_User+18);
const CString HELP_TEXT = const CString INPUT_TIPS_TEXT =
#if !defined(XBOX) #if !defined(XBOX)
"Up/Down:\n change beat\n" "Up/Down:\n change beat\n"
"Left/Right:\n change snap\n" "Left/Right:\n change snap\n"
@@ -563,21 +563,15 @@ void ScreenEdit::Init()
this->AddChild( &m_Foreground ); this->AddChild( &m_Foreground );
m_textHelp.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInputTips.LoadFromFont( THEME->GetPathF("ScreenEdit","InputTips") );
m_textHelp.SetXY( HELP_TEXT_X, HELP_TEXT_Y ); m_textInputTips.SetName( "InputTips" );
m_textHelp.SetHorizAlign( Actor::align_left ); m_textInputTips.SetText( INPUT_TIPS_TEXT );
m_textHelp.SetVertAlign( Actor::align_top ); SET_XY_AND_ON_COMMAND( m_textInputTips );
m_textHelp.SetZoom( 0.5f ); this->AddChild( &m_textInputTips );
m_textHelp.SetText( HELP_TEXT );
m_textHelp.SetShadowLength( 0 );
this->AddChild( &m_textHelp );
m_textInfo.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInfo.LoadFromFont( THEME->GetPathF("ScreenEdit","Info") );
m_textInfo.SetXY( INFO_TEXT_X, INFO_TEXT_Y ); m_textInfo.SetName( "Info" );
m_textInfo.SetHorizAlign( Actor::align_left ); SET_XY_AND_ON_COMMAND( m_textInfo );
m_textInfo.SetVertAlign( Actor::align_top );
m_textInfo.SetZoom( 0.5f );
m_textInfo.SetShadowLength( 0 );
this->AddChild( &m_textInfo ); this->AddChild( &m_textInfo );
@@ -1423,7 +1417,7 @@ void ScreenEdit::TransitionEditMode( EditMode em )
// Show/hide depending on em // Show/hide depending on em
// //
m_Background.SetHidden( !PREFSMAN->m_bEditorShowBGChangesPlay || em == MODE_EDITING ); m_Background.SetHidden( !PREFSMAN->m_bEditorShowBGChangesPlay || em == MODE_EDITING );
m_textHelp.SetHidden( em != MODE_EDITING ); m_textInputTips.SetHidden( em != MODE_EDITING );
m_textInfo.SetHidden( em != MODE_EDITING ); m_textInfo.SetHidden( em != MODE_EDITING );
m_SnapDisplay.SetHidden( em != MODE_EDITING ); m_SnapDisplay.SetHidden( em != MODE_EDITING );
m_NoteFieldEdit.SetHidden( em != MODE_EDITING ); m_NoteFieldEdit.SetHidden( em != MODE_EDITING );
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -159,7 +159,7 @@ protected:
NoteData m_NoteDataEdit; NoteData m_NoteDataEdit;
SnapDisplay m_SnapDisplay; SnapDisplay m_SnapDisplay;
BitmapText m_textHelp; BitmapText m_textInputTips;
BitmapText m_textInfo; // status information that changes BitmapText m_textInfo; // status information that changes
// keep track of where we are and what we're doing // keep track of where we are and what we're doing