Merge 71ac8d508b into 7546c1acab

Fix coding style to better conform to the guidelines
Merge remote-tracking branch 'upstream/master'
2025-07-14 08:03:53 +00:00 · 2025-06-19 22:34:08 +02:00 · 2025-06-19 21:57:09 +02:00 · 2025-06-19 21:57:00 +02:00
1 changed files with 6 additions and 1 deletions
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@ -418,6 +418,7 @@ struct GameOptionsWindow : Window {
 	GameSettings *opt = nullptr;
 	bool reload = false;
 	int gui_scale = 0;
+	static inline int previous_gui_scale = 0; ///< Previous GUI scale.
 	static inline WidgetID active_tab = WID_GO_TAB_GENERAL;

 	GameOptionsWindow(WindowDesc &desc) : Window(desc), filter_editbox(50), gui_scale(_gui_scale)
@ -1066,9 +1067,13 @@ struct GameOptionsWindow : Window {
 			case WID_GO_GUI_SCALE_AUTO:
 			{
 				if (_gui_scale_cfg == -1) {
-					_gui_scale_cfg = _gui_scale;
+					_gui_scale_cfg = previous_gui_scale; // Store the previous GUI scale value
 					this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, false);
+					if (AdjustGUIZoom(false))
+					    ReInitAllWindows(true);
+					this->gui_scale = _gui_scale;
 				} else {
+					previous_gui_scale = _gui_scale;	// Set the previous GUI scale value as the current one
 					_gui_scale_cfg = -1;
 					this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, true);
 					if (AdjustGUIZoom(false)) ReInitAllWindows(true);
Author	SHA1	Message	Date
Oliver Bechstein-Rumble	49458a68fe	Merge `71ac8d508b` into `7546c1acab`	2025-07-14 08:03:53 +00:00
OllieBechstein	71ac8d508b	Fix coding style to better conform to the guidelines	2025-06-19 22:34:08 +02:00
OllieBechstein	d6222cd5d7	Merge remote-tracking branch 'upstream/master'	2025-06-19 21:57:09 +02:00
OllieBechstein	a87144d669	Added a variable in settings_gui that can remember the previous gui scale that was set. This means that toggling the auto scale on and then off will revert the scale to it's previous value.	2025-06-19 21:57:00 +02:00