diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 4f3adc6496..4fc9a95835 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -14,6 +14,10 @@ sm-ssc v1.0 Release Candidate 2 | 201007xx -------------------------------------------------------------------------------- (work in progress, it's not out yet [hence the "xx" above].) +20100630 +-------- +* [ScreenDebugOverlay] add LineStartY, LineSpacing metrics + 20100629 -------- * Fix an issue involving setting a group via GameCommand and a metric ([MusicWheel] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 46c5a8ede5..5dd56ceb7b 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1146,6 +1146,8 @@ Class="ScreenDebugOverlay" Fallback="Screen" LineOnColor=color("1,1,1,1") LineOffColor=color("0.6,0.6,0.6,1") +LineStartY=SCREEN_TOP+50 +LineSpacing=16 PageTextGainFocusCommand=diffuse,color("1,1,1,1") PageTextLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1") diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp index 38720efaf6..d35b6734c2 100644 --- a/src/ScreenDebugOverlay.cpp +++ b/src/ScreenDebugOverlay.cpp @@ -36,9 +36,11 @@ static RageTimer g_HaltTimer(RageZeroTimer); static float g_fImageScaleCurrent = 1; static float g_fImageScaleDestination = 1; -// colors +// DebugLine theming static const ThemeMetric LINE_ON_COLOR ("ScreenDebugOverlay", "LineOnColor"); static const ThemeMetric LINE_OFF_COLOR ("ScreenDebugOverlay", "LineOffColor"); +static const ThemeMetric DEBUG_LINE_START_Y ("ScreenDebugOverlay", "LineStartY"); +static const ThemeMetric DEBUG_LINE_SPACING ("ScreenDebugOverlay", "LineSpacing"); // self-registering debug lines // We don't use SubscriptionManager, because we want to keep the line order. @@ -337,17 +339,9 @@ void ScreenDebugOverlay::Update( float fDeltaTime ) void ScreenDebugOverlay::UpdateText() { - /* Highlight options that aren't the default. */ - // xxx: convert these into metrics? -aj - /* - const RageColor off(0.7f, 0.7f, 0.7f, 1.0f); - const RageColor on(1, 1, 1, 1); - */ - FOREACH_CONST( RString, m_asPages, s ) { int iPage = s - m_asPages.begin(); - //m_vptextPages[iPage]->SetDiffuse( (iPage == m_iCurrentPage) ? on : off ); m_vptextPages[iPage]->PlayCommand( (iPage == m_iCurrentPage) ? "GainFocus" : "LoseFocus" ); } @@ -359,7 +353,8 @@ void ScreenDebugOverlay::UpdateText() int i = p-g_pvpSubscribers->begin(); - float fY = SCREEN_TOP+50 + iOffset * 16; + //float fY = SCREEN_TOP+50 + iOffset * 16; + float fY = DEBUG_LINE_START_Y + iOffset * DEBUG_LINE_SPACING; BitmapText &txt1 = *m_vptextButton[i]; BitmapText &txt2 = *m_vptextFunction[i];