From 135e16196b338766e749cf16799b70c4db4b810e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 18 Dec 2003 20:26:48 +0000 Subject: [PATCH] add ScreenRanking banner frame --- .../default/Graphics/ScreenRanking banner frame.redir | 1 + stepmania/Themes/default/metrics.ini | 4 ++++ stepmania/src/ScreenRanking.cpp | 9 +++++++++ stepmania/src/ScreenRanking.h | 1 + 4 files changed, 15 insertions(+) create mode 100644 stepmania/Themes/default/Graphics/ScreenRanking banner frame.redir diff --git a/stepmania/Themes/default/Graphics/ScreenRanking banner frame.redir b/stepmania/Themes/default/Graphics/ScreenRanking banner frame.redir new file mode 100644 index 0000000000..c700c90d39 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenRanking banner frame.redir @@ -0,0 +1 @@ +_blank diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 438ccc1fab..7d65730983 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2475,6 +2475,10 @@ BannerWidth=220 BannerHeight=58 BannerOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640 BannerOffCommand=sleep,0.0;linear,0.5;diffusealpha,0 +BannerFrameX=0 +BannerFrameY=0 +BannerFrameOnCommand=hidden,1 +BannerFrameOffCommand= TypeX=520 TypeY=60 TypeOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640 diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 2f8c67da09..19f197bffd 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -90,6 +90,9 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) m_banner.SetName( "Banner" ); this->AddChild( &m_banner ); + m_sprBannerFrame.SetName( "BannerFrame" ); + this->AddChild( &m_sprBannerFrame ); + m_textCategory.SetName( "Category" ); m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking title") ); m_textCategory.EnableShadow( false ); @@ -320,6 +323,8 @@ void ScreenRanking::SetPage( PageToShow pts ) SET_XY_AND_ON_COMMAND( m_sprCategory ); m_banner.Reset(); SET_XY_AND_ON_COMMAND( m_banner ); + m_sprBannerFrame.Reset(); + SET_XY_AND_ON_COMMAND( m_sprBannerFrame ); m_textCategory.Reset(); SET_XY_AND_ON_COMMAND( m_textCategory ); m_sprType.Reset(); @@ -524,6 +529,9 @@ void ScreenRanking::SetPage( PageToShow pts ) m_banner.ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); m_banner.SetDiffuseAlpha(1); + m_sprBannerFrame.Load( THEME->GetPathToG("ScreenRanking banner frame") ); + m_sprBannerFrame.SetDiffuseAlpha(1); + m_textCategory.SetMaxWidth( CATEGORY_WIDTH ); m_textCategory.SetText( pts.pSong->GetFullTranslitTitle() ); m_textCategory.SetDiffuseAlpha(1); @@ -579,6 +587,7 @@ void ScreenRanking::TweenPageOffScreen() OFF_COMMAND( m_sprCategory ); OFF_COMMAND( m_banner ); + OFF_COMMAND( m_sprBannerFrame ); OFF_COMMAND( m_sprType ); OFF_COMMAND( m_textCategory ); diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h index 3b4b26c3cf..72002a0bf7 100644 --- a/stepmania/src/ScreenRanking.h +++ b/stepmania/src/ScreenRanking.h @@ -45,6 +45,7 @@ protected: Sprite m_sprCategory; Banner m_banner; + Sprite m_sprBannerFrame; BitmapText m_textCategory; Sprite m_sprType; Sprite m_sprBullets[NUM_RANKING_LINES];