From cbdcb9a036db48e2bb28e996a1688dec25ce4935 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Wed, 10 Sep 2008 17:12:14 +0000 Subject: [PATCH] Add metrics for the skip display --- stepmania/Themes/default/metrics.ini | 7 ++++++- stepmania/src/ScreenStatsOverlay.cpp | 8 ++++---- stepmania/src/ScreenStatsOverlay.h | 5 +++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 2c2c5a51cf..271a90fe92 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1832,7 +1832,12 @@ Class="ScreenStatsOverlay" Fallback="Screen" StatsX=SCREEN_RIGHT-8 StatsY=SCREEN_TOP+10 -StatsOnCommand=horizalign,right;vertalign,top;shadowlength,2 +StatsOnCommand=horizalign,right;vertalign,top;shadowlength,1 + +SkipX=SCREEN_RIGHT-100 +SkipY=SCREEN_BOTTOM-100 +SkipWidth=190 +SkipSpacingY=14 [MusicWheelItem] IconX=-136 diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp index 6c67049f27..b04f8bc9b4 100644 --- a/stepmania/src/ScreenStatsOverlay.cpp +++ b/stepmania/src/ScreenStatsOverlay.cpp @@ -23,10 +23,10 @@ void ScreenStatsOverlay::Init() * the time in the log. */ m_LastSkip = 0; - const float SKIP_X = SCREEN_RIGHT - 100; - const float SKIP_Y = SCREEN_BOTTOM - 100; - const float SKIP_WIDTH = 190; - const float SKIP_SPACING_Y = 14; + SKIP_X.Load( m_sName, "SkipX" ); + SKIP_Y.Load( m_sName, "SkipY" ); + SKIP_SPACING_Y.Load( m_sName, "SkipSpacingY" ); + SKIP_WIDTH.Load( m_sName, "SkipWidth" ); RectF rectSkips = RectF( SKIP_X-SKIP_WIDTH/2, diff --git a/stepmania/src/ScreenStatsOverlay.h b/stepmania/src/ScreenStatsOverlay.h index 7903d12628..bce38b5c0a 100644 --- a/stepmania/src/ScreenStatsOverlay.h +++ b/stepmania/src/ScreenStatsOverlay.h @@ -25,6 +25,11 @@ private: BitmapText m_textSkips[NUM_SKIPS_TO_SHOW]; RageTimer m_timerSkip; int m_LastSkip; + + ThemeMetric SKIP_X; + ThemeMetric SKIP_Y; + ThemeMetric SKIP_SPACING_Y; + ThemeMetric SKIP_WIDTH; };