From 204ee8a5d798bd5ab66b5b0f44516afb7720906f Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 27 Jun 2017 19:11:52 +0300 Subject: [PATCH] Always show terraform menu in compact toolbar mode --- src/airport_gui.cpp | 2 +- src/dock_gui.cpp | 2 +- src/rail_gui.cpp | 2 +- src/road_gui.cpp | 2 +- src/toolbar_gui.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 14442408ce..ff4522e81f 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -75,7 +75,7 @@ struct BuildAirToolbarWindow : Window { BuildAirToolbarWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc) { this->InitNested(window_number); - if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); + if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this); this->last_user_action = WIDGET_LIST_END; } diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index b555daca1c..9c8453ae82 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -101,7 +101,7 @@ struct BuildDocksToolbarWindow : Window { this->last_clicked_widget = WID_DT_INVALID; this->InitNested(window_number); this->OnInvalidateData(); - if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); + if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this); } ~BuildDocksToolbarWindow() diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 2ff3a844a5..f2c9d5636f 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -409,7 +409,7 @@ struct BuildRailToolbarWindow : Window { this->last_user_action = WIDGET_LIST_END; this->last_user_action_remove = false; - if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); + if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this); } ~BuildRailToolbarWindow() diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 4ab5091e21..1da4b47f88 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -315,7 +315,7 @@ struct BuildRoadToolbarWindow : Window { this->last_started_action_remove = false; this->last_started_action_oneway = false; - if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); + if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this); } ~BuildRoadToolbarWindow() diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index c50367fc96..6bd3100d6b 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -2308,7 +2308,7 @@ class NWidgetVerticalToolbarContainer : public NWidgetToolbarContainer { WID_TN_MESSAGES, WID_TN_HELP, }; - // TODO: WID_TN_SUBSIDIES, WID_TN_INDUSTRIES, WID_TN_LANDSCAPE, + // TODO: WID_TN_SUBSIDIES, WID_TN_INDUSTRIES, static const byte arrange_right_compact_noswitch[] = { WID_TN_RAILS, WID_TN_TRAINS,