From c6d4812563f9be6145e20d0430e5d8f7d12f866b Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 31 Mar 2017 02:48:56 +0300 Subject: [PATCH] Option in settings for window decorations --- src/lang/english.txt | 2 ++ src/settings_gui.cpp | 1 + src/settings_type.h | 1 + src/table/settings.ini | 8 ++++++++ src/widget.cpp | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index bce4b05292..afc9fbef61 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1222,6 +1222,8 @@ STR_CONFIG_SETTING_BUILD_CONFIRMATION :{BLACK}Confirm STR_CONFIG_SETTING_BUILD_CONFIRMATION_HELPTEXT :{BLACK}Show confirmation dialog when building roads and stations STR_CONFIG_SETTING_WINDOWS_TITLEBARS :{BLACK}Title bars STR_CONFIG_SETTING_WINDOWS_TITLEBARS_HELPTEXT :{BLACK}Show title bars for all windows, or hide them to save screen space +STR_CONFIG_SETTING_WINDOWS_DECORATIONS :{BLACK}Window decorations +STR_CONFIG_SETTING_WINDOWS_DECORATIONS_HELPTEXT :{BLACK}Ornaments on window edges STR_CONFIG_SETTING_VIDEO_8BPP :{BLACK}8 bit STR_CONFIG_SETTING_VIDEO_8BPP_HELPTEXT :{BLACK}Set video color depth to 8 bits per pixel, this video mode supports water animation STR_CONFIG_SETTING_VIDEO_16BPP :{BLACK}16 bit diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 8a674b4741..0fdad13794 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1651,6 +1651,7 @@ static SettingsContainer &GetSettingsTree() interface->Add(new SettingEntry("gui.vertical_toolbar")); interface->Add(new SettingEntry("gui.build_confirmation")); interface->Add(new SettingEntry("gui.windows_titlebars")); + interface->Add(new SettingEntry("gui.windows_decorations")); interface->Add(new SettingEntry("gui.toolbar_pos")); interface->Add(new SettingEntry("gui.statusbar_pos")); interface->Add(new SettingEntry("gui.prefer_teamchat")); diff --git a/src/settings_type.h b/src/settings_type.h index a16a7f6cf3..96614bbd5b 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -80,6 +80,7 @@ struct GUISettings { bool vertical_toolbar; ///< main toolbar is split into two vertical toolbars bool build_confirmation; ///< show confirmation dialog when building roads and stations bool windows_titlebars; ///< show or hide titlebars for all windows to increase scrren space + bool windows_decorations; ///< draw ornament on all window edges uint min_button; ///< min size of most button widgets uint min_step; ///< min size of scrollbar/dropdown elements bool show_finances; ///< show finances at end of year diff --git a/src/table/settings.ini b/src/table/settings.ini index 454af88d70..7e585b919f 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2574,6 +2574,14 @@ str = STR_CONFIG_SETTING_WINDOWS_TITLEBARS strhelp = STR_CONFIG_SETTING_WINDOWS_TITLEBARS_HELPTEXT cat = SC_BASIC +[SDTC_BOOL] +var = gui.windows_decorations +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +def = false +str = STR_CONFIG_SETTING_WINDOWS_DECORATIONS +strhelp = STR_CONFIG_SETTING_WINDOWS_DECORATIONS_HELPTEXT +cat = SC_BASIC + [SDTC_BOOL] var = gui.show_finances flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC diff --git a/src/widget.cpp b/src/widget.cpp index c54bfb7b32..e0f235f7c4 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -900,7 +900,8 @@ void NWidgetCore::DrawEdgeOrnament(const Window *w) const w->window_class == WC_BUILD_CONFIRMATION || w->window_class == WC_STATUS_BAR || w->window_class == WC_TOOLTIPS || - w->window_class == WC_DROPDOWN_MENU) { + w->window_class == WC_DROPDOWN_MENU || + !_settings_client.gui.windows_decorations) { return; } if (this->pos_x == 0) {