|
From: Tapio V. <aa...@us...> - 2009-12-20 12:36:00
|
Module: performous
Branch: master
Commit: f6c6b94b5df0ef3753be2bb05ef01c15ea0ed07a
Author: Tapio Vierros <tap...@gm...>
Date: Sun Dec 20 14:35:05 2009 +0200
Added some info texts to config screen.
---
game/screen_configuration.cc | 11 +++++++++++
game/theme.cc | 4 +++-
game/theme.hh | 4 ++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 6431943..715fed7 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -47,6 +47,17 @@ void ScreenConfiguration::draw() {
ConfigItem const& ci = config[configuration[selected]];
theme->item.draw(ci.getShortDesc());
theme->value.draw(ci.getValue());
+ // Long description
+ theme->comment_bg.dimensions.middle().screenBottom(-0.05);
+ theme->comment_bg.draw();
+ theme->comment.dimensions.left(-0.48).screenBottom(-0.068);
+ theme->comment.draw(ci.getLongDesc());
+ // Key help
+ theme->comment_bg.dimensions.middle().screenBottom(-0.01);
+ theme->comment_bg.draw();
+ theme->comment.dimensions.left(-0.48).screenBottom(-0.028);
+ theme->comment.draw("Ctrl + S to save, Ctrl + R to reset defaults");
+
}
}
diff --git a/game/theme.cc b/game/theme.cc
index 69feb9b..88d48ec 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -37,7 +37,9 @@ ThemeSing::ThemeSing():
ThemeConfiguration::ThemeConfiguration():
Theme(getThemePath("configuration_bg.svg")),
item(getThemePath("configuration_item.svg"), config["graphic/text_lod"].f()),
- value(getThemePath("configuration_value.svg"), config["graphic/text_lod"].f())
+ value(getThemePath("configuration_value.svg"), config["graphic/text_lod"].f()),
+ comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
+ comment_bg(getThemePath("menu_comment_bg.svg"))
{}
ThemeIntro::ThemeIntro():
diff --git a/game/theme.hh b/game/theme.hh
index eebee88..73967de 100755
--- a/game/theme.hh
+++ b/game/theme.hh
@@ -57,6 +57,10 @@ struct ThemeConfiguration: Theme {
SvgTxtTheme item;
/// configuration value
SvgTxtTheme value;
+ /// configuration comment text
+ SvgTxtTheme comment;
+ /// configuration comment background
+ Surface comment_bg;
};
/// theme for intro screen
|