actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean up TextBanner metrics

Browse Source
This commit is contained in:
Chris Danford
2003-11-02 08:43:47 +00:00
parent a860b5ef8b
commit f0b048626a
2 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+11 -3
View File
@@ -2273,6 +2273,8 @@ Player2Profile=
CreateNew= CreateNew=
Delete= Delete=
Rename= Rename=
CardDirPlayer1=
CardDirPlayer2=
StyleIcon=0 StyleIcon=0
TimerSeconds=0 TimerSeconds=0
@@ -2725,9 +2727,15 @@ Line14=list,Reload Songs/Courses;title,;
Line15=list,Test Input;title,; Line15=list,Test Input;title,;
[TextBanner] [TextBanner]
Width=180 TitleHorizX=-90
Height=40 SubTitleHorizX=-90
HorizAlign=0 ArtistHorizX=-90
MaxTitleWidth=180
MaxSubTitleWidth=180
MaxArtistWidth=180
TitleHorizAlign=0
SubTitleHorizAlign=0
ArtistHorizAlign=0
ArtistPrependString=/ ArtistPrependString=/
TwoLinesTitleZoom=1.0 TwoLinesTitleZoom=1.0
TwoLinesArtistZoom=0.6 TwoLinesArtistZoom=0.6
stepmania/src/TextBanner.cpp
+57 -61
View File
@@ -19,66 +19,62 @@
#include "RageTextureManager.h" #include "RageTextureManager.h"
#define WIDTH THEME->GetMetricF("TextBanner","Width") CachedThemeMetricI TITLE_X ("TextBanner","TitleHorizX");
#define HEIGHT THEME->GetMetricF("TextBanner","Height") CachedThemeMetricI SUB_TITLE_X ("TextBanner","SubTitleHorizX");
#define HORIZ_ALIGN THEME->GetMetricI("TextBanner","HorizAlign") CachedThemeMetricI ARTIST_X ("TextBanner","ArtistHorizX");
#define ARTIST_PREPEND_STRING THEME->GetMetric( "TextBanner","ArtistPrependString") CachedThemeMetricF MAX_TITLE_WIDTH ("TextBanner","MaxTitleWidth");
#define TWO_LINES_TITLE_ZOOM THEME->GetMetricF("TextBanner","TwoLinesTitleZoom") CachedThemeMetricF MAX_SUB_TITLE_WIDTH ("TextBanner","MaxSubTitleWidth");
#define TWO_LINES_ARTIST_ZOOM THEME->GetMetricF("TextBanner","TwoLinesArtistZoom") CachedThemeMetricF MAX_ARTIST_WIDTH ("TextBanner","MaxArtistWidth");
#define THREE_LINES_TITLE_ZOOM THEME->GetMetricF("TextBanner","ThreeLinesTitleZoom") CachedThemeMetricI TITLE_HORIZ_ALIGN ("TextBanner","TitleHorizAlign");
#define THREE_LINES_SUB_TITLE_ZOOM THEME->GetMetricF("TextBanner","ThreeLinesSubTitleZoom") CachedThemeMetricI SUB_TITLE_HORIZ_ALIGN ("TextBanner","SubTitleHorizAlign");
#define THREE_LINES_ARTIST_ZOOM THEME->GetMetricF("TextBanner","ThreeLinesArtistZoom") CachedThemeMetricI ARTIST_HORIZ_ALIGN ("TextBanner","ArtistHorizAlign");
#define TWO_LINES_TITLE_Y THEME->GetMetricF("TextBanner","TwoLinesTitleY") CachedThemeMetric ARTIST_PREPEND_STRING ("TextBanner","ArtistPrependString");
#define TWO_LINES_ARTIST_Y THEME->GetMetricF("TextBanner","TwoLinesArtistY") CachedThemeMetricF TWO_LINES_TITLE_ZOOM ("TextBanner","TwoLinesTitleZoom");
#define THREE_LINES_TITLE_Y THEME->GetMetricF("TextBanner","ThreeLinesTitleY") CachedThemeMetricF TWO_LINES_ARTIST_ZOOM ("TextBanner","TwoLinesArtistZoom");
#define THREE_LINES_SUB_TITLE_Y THEME->GetMetricF("TextBanner","ThreeLinesSubTitleY") CachedThemeMetricF THREE_LINES_TITLE_ZOOM ("TextBanner","ThreeLinesTitleZoom");
#define THREE_LINES_ARTIST_Y THEME->GetMetricF("TextBanner","ThreeLinesArtistY") CachedThemeMetricF THREE_LINES_SUB_TITLE_ZOOM ("TextBanner","ThreeLinesSubTitleZoom");
CachedThemeMetricF THREE_LINES_ARTIST_ZOOM ("TextBanner","ThreeLinesArtistZoom");
// metrics cache CachedThemeMetricF TWO_LINES_TITLE_Y ("TextBanner","TwoLinesTitleY");
float g_fWidth; CachedThemeMetricF TWO_LINES_ARTIST_Y ("TextBanner","TwoLinesArtistY");
float g_fHeight; CachedThemeMetricF THREE_LINES_TITLE_Y ("TextBanner","ThreeLinesTitleY");
int g_iHorizAlign; CachedThemeMetricF THREE_LINES_SUB_TITLE_Y ("TextBanner","ThreeLinesSubTitleY");
CString g_sArtistPrependString; CachedThemeMetricF THREE_LINES_ARTIST_Y ("TextBanner","ThreeLinesArtistY");
float g_fTwoLinesTitleZoom;
float g_fTwoLinesArtistZoom;
float g_fThreeLinesTitleZoom;
float g_fThreeLinesSubTitleZoom;
float g_fThreeLinesArtistZoom;
float g_fTwoLinesTitleY;
float g_fTwoLinesArtistY;
float g_fThreeLinesTitleY;
float g_fThreeLinesSubTitleY;
float g_fThreeLinesArtistY;
TextBanner::TextBanner() TextBanner::TextBanner()
{ {
g_fWidth = WIDTH; TITLE_X.Refresh();
g_fHeight = HEIGHT; SUB_TITLE_X.Refresh();
g_iHorizAlign = HORIZ_ALIGN; ARTIST_X.Refresh();
g_sArtistPrependString = ARTIST_PREPEND_STRING; MAX_TITLE_WIDTH.Refresh();
g_fTwoLinesTitleZoom = TWO_LINES_TITLE_ZOOM; MAX_SUB_TITLE_WIDTH.Refresh();
g_fTwoLinesArtistZoom = TWO_LINES_ARTIST_ZOOM; MAX_ARTIST_WIDTH.Refresh();
g_fThreeLinesTitleZoom = THREE_LINES_TITLE_ZOOM; TITLE_HORIZ_ALIGN.Refresh();
g_fThreeLinesSubTitleZoom = THREE_LINES_SUB_TITLE_ZOOM; SUB_TITLE_HORIZ_ALIGN.Refresh();
g_fThreeLinesArtistZoom = THREE_LINES_ARTIST_ZOOM; ARTIST_HORIZ_ALIGN.Refresh();
g_fTwoLinesTitleY = TWO_LINES_TITLE_Y; ARTIST_PREPEND_STRING.Refresh();
g_fTwoLinesArtistY = TWO_LINES_ARTIST_Y; TWO_LINES_TITLE_ZOOM.Refresh();
g_fThreeLinesTitleY = THREE_LINES_TITLE_Y; TWO_LINES_ARTIST_ZOOM.Refresh();
g_fThreeLinesSubTitleY = THREE_LINES_SUB_TITLE_Y; THREE_LINES_TITLE_ZOOM.Refresh();
g_fThreeLinesArtistY = THREE_LINES_ARTIST_Y; THREE_LINES_SUB_TITLE_ZOOM.Refresh();
THREE_LINES_ARTIST_ZOOM.Refresh();
TWO_LINES_TITLE_Y.Refresh();
TWO_LINES_ARTIST_Y.Refresh();
THREE_LINES_TITLE_Y.Refresh();
THREE_LINES_SUB_TITLE_Y.Refresh();
THREE_LINES_ARTIST_Y.Refresh();
m_textTitle.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textTitle.LoadFromFont( THEME->GetPathToF("TextBanner") );
m_textSubTitle.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textSubTitle.LoadFromFont( THEME->GetPathToF("TextBanner") );
m_textArtist.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textArtist.LoadFromFont( THEME->GetPathToF("TextBanner") );
m_textTitle.SetX( -g_fWidth/2 ); m_textTitle.SetX( TITLE_X );
m_textSubTitle.SetX( -g_fWidth/2 ); m_textSubTitle.SetX( SUB_TITLE_X );
m_textArtist.SetX( -g_fWidth/2 ); m_textArtist.SetX( ARTIST_X );
m_textTitle.SetHorizAlign( (Actor::HorizAlign)g_iHorizAlign ); m_textTitle.SetHorizAlign( (Actor::HorizAlign)(int)TITLE_HORIZ_ALIGN );
m_textSubTitle.SetHorizAlign( (Actor::HorizAlign)g_iHorizAlign ); m_textSubTitle.SetHorizAlign( (Actor::HorizAlign)(int)SUB_TITLE_HORIZ_ALIGN );
m_textArtist.SetHorizAlign( (Actor::HorizAlign)g_iHorizAlign ); m_textArtist.SetHorizAlign( (Actor::HorizAlign)(int)ARTIST_HORIZ_ALIGN );
m_textTitle.EnableShadow( false ); m_textTitle.EnableShadow( false );
m_textSubTitle.EnableShadow( false ); m_textSubTitle.EnableShadow( false );
@@ -97,21 +93,21 @@ void TextBanner::LoadFromString(
{ {
bool bTwoLines = sDisplaySubTitle.size() == 0; bool bTwoLines = sDisplaySubTitle.size() == 0;
const float fTitleZoom = bTwoLines ? g_fTwoLinesTitleZoom : g_fThreeLinesTitleZoom; const float fTitleZoom = bTwoLines ? TWO_LINES_TITLE_ZOOM : THREE_LINES_TITLE_ZOOM;
const float fSubTitleZoom = bTwoLines ? 0 : g_fThreeLinesSubTitleZoom; const float fSubTitleZoom = bTwoLines ? 0 : THREE_LINES_SUB_TITLE_ZOOM;
const float fArtistZoom = bTwoLines ? g_fTwoLinesArtistZoom : g_fThreeLinesArtistZoom; const float fArtistZoom = bTwoLines ? TWO_LINES_ARTIST_ZOOM : THREE_LINES_ARTIST_ZOOM;
m_textTitle.SetZoom( fTitleZoom ); m_textTitle.SetZoom( fTitleZoom );
m_textSubTitle.SetZoom( fSubTitleZoom ); m_textSubTitle.SetZoom( fSubTitleZoom );
m_textArtist.SetZoom( fArtistZoom ); m_textArtist.SetZoom( fArtistZoom );
m_textTitle.SetTextMaxWidth( g_fWidth, sDisplayTitle, sTranslitTitle ); m_textTitle.SetTextMaxWidth( MAX_TITLE_WIDTH, sDisplayTitle, sTranslitTitle );
m_textSubTitle.SetTextMaxWidth( g_fWidth, sDisplaySubTitle, sTranslitSubTitle ); m_textSubTitle.SetTextMaxWidth( MAX_SUB_TITLE_WIDTH, sDisplaySubTitle, sTranslitSubTitle );
m_textArtist.SetTextMaxWidth( g_fWidth, sDisplayArtist, sTranslitArtist ); m_textArtist.SetTextMaxWidth( MAX_ARTIST_WIDTH, sDisplayArtist, sTranslitArtist );
const float fTitleY = bTwoLines ? g_fTwoLinesTitleY : g_fThreeLinesTitleY; const float fTitleY = bTwoLines ? TWO_LINES_TITLE_Y : THREE_LINES_TITLE_Y;
const float fSubTitleY = bTwoLines ? 0 : g_fThreeLinesSubTitleY; const float fSubTitleY = bTwoLines ? 0 : THREE_LINES_SUB_TITLE_Y;
const float fArtistY = bTwoLines ? g_fTwoLinesArtistY : g_fThreeLinesArtistY; const float fArtistY = bTwoLines ? TWO_LINES_ARTIST_Y : THREE_LINES_ARTIST_Y;
m_textTitle.SetY( fTitleY ); m_textTitle.SetY( fTitleY );
m_textSubTitle.SetY( fSubTitleY ); m_textSubTitle.SetY( fSubTitleY );
@@ -124,8 +120,8 @@ void TextBanner::LoadFromSong( const Song* pSong )
CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : ""; CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : "";
CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : ""; CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : "";
CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : ""; CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : "";
CString sDisplayArtist = pSong ? g_sArtistPrependString + pSong->GetDisplayArtist() : ""; CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : "";
CString sTranslitArtist = pSong ? g_sArtistPrependString + pSong->GetTranslitArtist() : ""; CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : "";
LoadFromString( LoadFromString(
sDisplayTitle, sTranslitTitle, sDisplayTitle, sTranslitTitle,