Change: Selecting rail/roadtype updates build toolbar

Author: mmtunligit

src/engine.cpp

@@ -30,6 +30,7 @@
 #include "articulated_vehicles.h"
 #include "error.h"
 #include "engine_base.h"
+#include "road_gui.h"
 #include "timer/timer.h"
 #include "timer/timer_game_tick.h"
 #include "timer/timer_game_calendar.h"
@@ -872,7 +873,7 @@ static void EnableEngineForCompany(EngineID eid, CompanyID company)
 
 		/* Update the toolbar. */
 		InvalidateWindowData(WindowClass::MainToolbar, 0);
-		if (e->type == VehicleType::Road) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD);
+		if (e->type == VehicleType::Road) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD, GetToolbarRoadType());
 		if (e->type == VehicleType::Ship) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_WATER);
 		if (e->type == VehicleType::Aircraft) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_AIR);
 	}
@@ -1155,7 +1156,7 @@ static void NewVehicleAvailable(Engine *e)
 	}
 
 	/* Update the toolbar. */
-	if (e->type == VehicleType::Road) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD);
+	if (e->type == VehicleType::Road) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD, GetToolbarRoadType());
 	if (e->type == VehicleType::Ship) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_WATER);
 	if (e->type == VehicleType::Aircraft) InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_AIR);
 

src/rail_gui.cpp

@@ -96,6 +96,15 @@ static bool IsStationAvailable(const StationSpec *statspec)
 	return Convert8bitBooleanCallback(statspec->grf_prop.grffile, CBID_STATION_AVAILABILITY, cb_res);
 }
 
+/**
+ * Get the current railtype.
+ * @return the current railtype.
+ */
+RailType GetToolbarRailType()
+{
+	return _cur_railtype;
+}
+
 void CcPlaySound_CONSTRUCTION_RAIL(Commands, const CommandCost &result, TileIndex tile)
 {
 	if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_20_CONSTRUCTION_RAIL, tile);
@@ -450,7 +459,7 @@ struct BuildRailToolbarWindow : Window {
 		this->CreateNestedTree();
 		this->FinishInitNested(TRANSPORT_RAIL);
 		this->DisableWidget(WID_RAT_REMOVE);
-		this->OnInvalidateData();
+		this->OnInvalidateData(railtype);
 
 		if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this);
 	}
@@ -475,7 +484,15 @@ struct BuildRailToolbarWindow : Window {
 	{
 		if (!gui_scope) return;
 
-		if (!ValParamRailType(this->railtype)) {
+		if (ValParamRailType(static_cast<RailType>(data))) {
+			_last_built_railtype = _cur_railtype = static_cast<RailType>(data);
+			this->ModifyRailType(_last_built_railtype);
+
+			/* Update cursor and all sub windows. */
+			if (_thd.GetCallbackWnd() == this) SetCursor(this->GetCursorForWidget(this->last_user_action), PAL_NONE);
+			for (WindowClass cls : {WindowClass::BuildStation, WindowClass::BuildSignal, WindowClass::BuildWaypoint, WindowClass::BuildDepot}) SetWindowDirty(cls, TRANSPORT_RAIL);
+
+		} else {
 			/* Close toolbar if rail type is not available. */
 			this->Close();
 			return;
@@ -964,6 +981,12 @@ Window *ShowBuildRailToolbar(RailType railtype)
 {
 	if (!Company::IsValidID(_local_company)) return nullptr;
 	if (!ValParamRailType(railtype)) return nullptr;
+	Window *w = FindWindowById(WindowClass::BuildToolbar, TRANSPORT_RAIL);
+
+	if (w != nullptr) {
+		w->OnInvalidateData(railtype);
+		return w;
+	}
 
 	CloseWindowByClass(WindowClass::BuildToolbar);
 	_cur_railtype = railtype;

src/rail_gui.h

@@ -18,6 +18,7 @@ void ReinitGuiAfterToggleElrail(bool disable);
 void ResetSignalVariant(int32_t = 0);
 void InitializeSignalGui();
 DropDownList GetRailTypeDropDownList(bool for_replacement = false, bool all_option = false);
+RailType GetToolbarRailType();
 void SetDefaultRailGui();
 
 /** Settings for which signals are shown by the signal GUI. */

src/road_gui.cpp

@@ -115,6 +115,15 @@ static bool IsRoadStopAvailable(const RoadStopSpec *spec, StationType type)
 	return Convert8bitBooleanCallback(spec->grf_prop.grffile, CBID_STATION_AVAILABILITY, cb_res);
 }
 
+/**
+ * Get the current roadtype.
+ * @return the current roadtype.
+ */
+RoadType GetToolbarRoadType()
+{
+	return _cur_roadtype;
+}
+
 void CcPlaySound_CONSTRUCTION_OTHER(Commands, const CommandCost &result, TileIndex tile)
 {
 	if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_1F_CONSTRUCTION_OTHER, tile);
@@ -360,7 +369,7 @@ struct BuildRoadToolbarWindow : Window {
 			this->SetWidgetDisabledState(WID_ROT_ONE_WAY, true);
 		}
 
-		this->OnInvalidateData();
+		this->OnInvalidateData(roadtype);
 
 		if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this);
 	}
@@ -381,7 +390,18 @@ struct BuildRoadToolbarWindow : Window {
 	{
 		if (!gui_scope) return;
 
-		if (!ValParamRoadType(this->roadtype)) {
+		if (ValParamRoadType(static_cast<RoadType>(data))) {
+			if (RoadTypeIsRoad(static_cast<RoadType>(data))) {
+				_last_built_roadtype = _cur_roadtype = static_cast<RoadType>(data);
+			} else {
+				_last_built_tramtype = _cur_roadtype = static_cast<RoadType>(data);
+			}
+			this->ModifyRoadType(_cur_roadtype);
+
+			if (_thd.GetCallbackWnd() == this) SetCursor(this->GetCursorForWidget(this->last_started_action), PAL_NONE);
+			for (WindowClass cls : {WindowClass::BuildBusStation, WindowClass::BuildTruckStation, WindowClass::BuildWaypoint, WindowClass::BuildDepot}) SetWindowDirty(cls, TRANSPORT_ROAD);
+
+		} else {
 			/* Close toolbar if road type is not available. */
 			this->Close();
 			return;
@@ -1061,6 +1081,12 @@ Window *ShowBuildRoadToolbar(RoadType roadtype)
 {
 	if (!Company::IsValidID(_local_company)) return nullptr;
 	if (!ValParamRoadType(roadtype)) return nullptr;
+	Window *w = FindWindowById(WindowClass::BuildToolbar, TRANSPORT_ROAD);
+
+	if (w != nullptr && GetRoadTramType(roadtype) == GetRoadTramType(_cur_roadtype)) {
+		w->OnInvalidateData(roadtype);
+		return w;
+	}
 
 	CloseWindowByClass(WindowClass::BuildToolbar);
 	_cur_roadtype = roadtype;

src/road_gui.h

@@ -22,5 +22,6 @@ void ConnectRoadToStructure(TileIndex tile, DiagDirection direction);
 DropDownList GetRoadTypeDropDownList(RoadTramTypes rtts, bool for_replacement = false, bool all_option = false);
 DropDownList GetScenRoadTypeDropDownList(RoadTramTypes rtts);
 void SetDefaultRoadGui();
+RoadType GetToolbarRoadType();
 
 #endif /* ROAD_GUI_H */

src/saveload/afterload.cpp

@@ -53,6 +53,7 @@
 #include "../newgrf_station.h"
 #include "../engine_func.h"
 #include "../rail_gui.h"
+#include "../road_gui.h"
 #include "../core/backup_type.hpp"
 #include "../smallmap_gui.h"
 #include "../news_func.h"
@@ -3500,8 +3501,10 @@ void ReloadNewGRFData()
 	for (CompanyID i = CompanyID::Begin(); i < MAX_COMPANIES; ++i) InvalidateWindowData(WindowClass::CompanyLivery, i);
 	/* Update company infrastructure counts. */
 	InvalidateWindowClassesData(WindowClass::CompanyInfrastructure);
-	InvalidateWindowClassesData(WindowClass::BuildToolbar);
-	InvalidateAllPickerWindows();
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_RAIL, GetToolbarRailType());
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD, GetToolbarRoadType());
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_WATER);
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_AIR);
 	/* redraw the whole screen */
 	MarkWholeScreenDirty();
 	CheckTrainsLengths();

src/settings_table.cpp

@@ -28,6 +28,7 @@
 #endif
 #include "textbuf_gui.h"
 #include "rail_gui.h"
+#include "road_gui.h"
 #include "elrail_func.h"
 #include "error.h"
 #include "town.h"
@@ -583,7 +584,10 @@ static void StationCatchmentChanged(int32_t)
 
 static void MaxVehiclesChanged(int32_t)
 {
-	InvalidateWindowClassesData(WindowClass::BuildToolbar);
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_RAIL, GetToolbarRailType());
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_ROAD, GetToolbarRoadType());
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_WATER);
+	InvalidateWindowData(WindowClass::BuildToolbar, TRANSPORT_AIR);
 	MarkWholeScreenDirty();
 }