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

Have OptionRow load from its own metrics group rather than from ScreeOptions. The purpose of some elements isn't clear from the element name when everything loads from one group.

Browse Source
This commit is contained in:
Chris Danford
2008-04-27 19:47:50 +00:00
parent c7d3d1c0e3
commit c8d8b8925d
9 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.h
+6 -5
View File
@@ -24,14 +24,14 @@ private:
BitmapText m_textItem;
OptionsCursor m_Underline[NUM_PLAYERS];
AutoActor m_sprRowFrameNormal;
AutoActor m_sprRowFrameExit;
AutoActor m_sprFrameNormal;
AutoActor m_sprFrameExit;
BitmapText m_textTitle;
OptionIcon m_OptionIcon;
// metrics
ThemeMetric<float> ROWFRAME_X;
ThemeMetric<apActorCommands> ROWFRAME_ON_COMMAND;
ThemeMetric<float> FRAME_X;
ThemeMetric<apActorCommands> FRAME_ON_COMMAND;
ThemeMetric<float> TITLE_X;
ThemeMetric<apActorCommands> TITLE_ON_COMMAND;
ThemeMetric<apActorCommands> TITLE_GAIN_FOCUS_COMMAND;
@@ -56,6 +56,7 @@ private:
ThemeMetric<bool> SHOW_BPM_IN_SPEED_TITLE;
ThemeMetric<bool> SHOW_OPTION_ICONS;
ThemeMetric<bool> SHOW_UNDERLINES;
ThemeMetric<RString> OPTION_ICON_METRICS_GROUP;
friend class OptionRow;
};
@@ -140,7 +141,7 @@ protected:
vector<BitmapText *> m_textItems; // size depends on m_bRowIsLong and which players are joined
vector<OptionsCursor *> m_Underline[NUM_PLAYERS]; // size depends on m_bRowIsLong and which players are joined
Actor *m_sprRowFrame;
Actor *m_sprFrame;
BitmapText *m_textTitle;
OptionIcon *m_OptionIcons[NUM_PLAYERS];