Mercurial > hg > openttd

changeset 19397:0ca99082a623 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24298) -Feature: Display default values for adv. settings in the settings description.
author frosch <frosch@openttd.org>
date Mon, 28 May 2012 13:34:46 +0000
parents 1586f6599a5b
children e94ce1dbe1e1
files src/lang/english.txt src/settings_gui.cpp
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1104,6 +1104,7 @@
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Advanced Settings
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no explanation available)
+STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Default value: {ORANGE}{STRING1}
 
 STR_CONFIG_SETTING_OFF                                          :Off
 STR_CONFIG_SETTING_ON                                           :On
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1738,7 +1738,8 @@
 				break;
 
 			case WID_GS_HELP_TEXT:
-				size->height = max(size->height, _settings_main_page.GetMaxHelpHeight(size->width));
+				size->height = FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL +
+						max(size->height, _settings_main_page.GetMaxHelpHeight(size->width));
 				break;
 
 			default:
@@ -1756,7 +1757,15 @@
 
 			case WID_GS_HELP_TEXT:
 				if (this->last_clicked != NULL) {
-					DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->last_clicked->GetHelpText(), TC_WHITE);
+					const SettingDesc *sd = this->last_clicked->d.entry.setting;
+					int32 default_value = ReadValue(&sd->desc.def, sd->save.conv);
+					this->last_clicked->SetValueDParams(0, default_value);
+
+					int y = r.top;
+					DrawString(r.left, r.right, y, STR_CONFIG_SETTING_DEFAULT_VALUE);
+					y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
+
+					DrawStringMultiLine(r.left, r.right, y, r.bottom, this->last_clicked->GetHelpText(), TC_WHITE);
 				}
 				break;