From ef46e6c088214b4b62f85747a9b9b47932f528f9 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 19 Dec 2010 13:42:20 -0600 Subject: [PATCH] [WheelNotifyIcon] add BlinkPlayersBest metric --- Docs/Changelog_sm-ssc.txt | 4 ++++ Themes/_fallback/metrics.ini | 1 + src/WheelNotifyIcon.cpp | 10 ++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 4c66657a84..b7d24874c1 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -13,6 +13,10 @@ _____________________________________________________________________________ sm-ssc v1.2 | 201012xx -------------------------------------------------------------------------------- +20101219 +-------- +* [WheelNotifyIcon] add BlinkPlayersBest metric [freem] + 20101218 -------- * [MusicWheelItem] Add OverPart. [freem] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 87ccb3e72c..56ca0b3f38 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1187,6 +1187,7 @@ AfterSetCommand=%TextBannerAfterSet [WheelNotifyIcon] ShowTraining=false +BlinkPlayersBest=true # 04 # [Screen] diff --git a/src/WheelNotifyIcon.cpp b/src/WheelNotifyIcon.cpp index 73b8cde395..ee1c0047f4 100644 --- a/src/WheelNotifyIcon.cpp +++ b/src/WheelNotifyIcon.cpp @@ -13,6 +13,7 @@ */ static ThemeMetric SHOW_TRAINING ("WheelNotifyIcon","ShowTraining"); +static ThemeMetric BLINK_BEST_ICON ("WheelNotifyIcon","BlinkPlayersBest"); WheelNotifyIcon::WheelNotifyIcon() { @@ -49,15 +50,16 @@ void WheelNotifyIcon::SetFlags( Flags flags ) m_vIconsToShow.push_back( training ); - // HACK: Make players best blink if it's the only icon - // TODO: metric this. use m_bPlayersBestHack as variable name, lol -aj - if( m_vIconsToShow.size() == 1 ) + // If BLINK_BEST_ICON, make player's best icon blink if it's the only icon. + if( m_vIconsToShow.size() == 1 && BLINK_BEST_ICON ) { if( m_vIconsToShow[0] >= best1 && m_vIconsToShow[0] <= best3 ) m_vIconsToShow.push_back( empty ); } - m_vIconsToShow.resize( min(m_vIconsToShow.size(),2u) ); // crop to most important 2 + // crop to most important 2 + // todo: Let themer handle this? -aj + m_vIconsToShow.resize( min(m_vIconsToShow.size(),2u) ); // Broadcast Set message so items can react. (futures) -aj //Message msg("Set");