Always show terraform menu in compact toolbar mode

This commit is contained in:
Sergii Pylypenko
2017-06-27 19:11:52 +03:00
parent dee7e1bf3d
commit 204ee8a5d7
5 changed files with 5 additions and 5 deletions

View File

@@ -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;
}

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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,