From bad9706b36ce76eb1ccbbe105c19448ffb19e0e6 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 7 Mar 2005 20:10:07 +0000 Subject: [PATCH] add OnCommads for text --- stepmania/Themes/default/metrics.ini | 4 +++- stepmania/src/EditMenu.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 349f70e856..97d01f105d 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2165,7 +2165,8 @@ MeterX=490 MeterY=220 SourceMeterX=490 SourceMeterY=300 -RowLabelsX=20 +RowLabelsX=40 +RowLabelOnCommand=zoom,0.7 RowValue1X=320 RowValue2X=380 RowValue3X=380 @@ -2173,6 +2174,7 @@ RowValue4X=320 RowValue5X=380 RowValue6X=320 RowValue7X=380 +RowValueOnCommand=zoom,0.7 Row1Y=80 Row2Y=130 Row3Y=180 diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index f069ff2bac..180e4f93b9 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -27,7 +27,9 @@ #define SOURCE_METER_X THEME->GetMetricF("EditMenu","SourceMeterX") #define SOURCE_METER_Y THEME->GetMetricF("EditMenu","SourceMeterY") #define ROW_LABELS_X THEME->GetMetricF("EditMenu","RowLabelsX") +#define ROW_LABEL_ON_COMMAND THEME->GetMetricA("EditMenu","RowLabelOnCommand") #define ROW_VALUE_X( i ) THEME->GetMetricF("EditMenu",ssprintf("RowValue%dX",i+1)) +#define ROW_VALUE_ON_COMMAND THEME->GetMetricA("EditMenu","RowValueOnCommand") #define ROW_Y( i ) THEME->GetMetricF("EditMenu",ssprintf("Row%dY",i+1)) @@ -58,14 +60,14 @@ EditMenu::EditMenu() m_textLabel[i].LoadFromFont( THEME->GetPathF("EditMenu","title") ); m_textLabel[i].SetXY( ROW_LABELS_X, ROW_Y(i) ); m_textLabel[i].SetText( RowToString((Row)i) ); - m_textLabel[i].SetZoom( 0.8f ); + m_textLabel[i].RunCommands( ROW_LABEL_ON_COMMAND ); m_textLabel[i].SetHorizAlign( Actor::align_left ); this->AddChild( &m_textLabel[i] ); m_textValue[i].LoadFromFont( THEME->GetPathF("EditMenu","value") ); m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) ); m_textValue[i].SetText( "blah" ); - m_textValue[i].SetZoom( 0.8f ); + m_textValue[i].RunCommands( ROW_VALUE_ON_COMMAND ); this->AddChild( &m_textValue[i] ); }