Remember window size #51

MakovWait · MakovWait · commit 72ffa6fc4d12 · 2023-11-07T23:37:10.000+01:00
diff --git a/src/components/settings/settings_window.gd b/src/components/settings/settings_window.gd
@@ -29,6 +29,12 @@ func _prepare_settings():
 			Config.USE_SYSTEM_TITLE_BAR,
 			SettingCheckbox
 		))), func(): return DisplayServer.has_feature(DisplayServer.FEATURE_EXTEND_TO_TITLE)),
+		SettingChangeObserved(SettingCfg(
+			"application/config/remember_window_rect",
+			Config.REMEMBER_WINDOW_SIZE,
+			SettingCheckbox,
+			tr("Restore last window size and position on startup.")
+		)),
 		
 		SettingRestartRequired(SettingChangeObserved(SettingCfg(
 			"application/theme/preset",
diff --git a/src/config.gd b/src/config.gd
@@ -135,6 +135,24 @@ var USE_SYSTEM_TITLE_BAR = ConfigFileValue.new(
 	set(_v): _readonly()
 
 
+var LAST_WINDOW_RECT = ConfigFileValue.new(
+	_cfg_auto_save, 
+	"app", 
+	"last_window_rect",
+	Rect2i()
+): 
+	set(_v): _readonly()
+
+
+var REMEMBER_WINDOW_SIZE = ConfigFileValue.new(
+	_cfg_auto_save, 
+	"app", 
+	"remember_window_size",
+	false
+): 
+	set(_v): _readonly()
+
+
 var ALLOW_INSTALL_TO_NOT_EMPTY_DIR = ConfigFileValue.new(
 	_cfg_auto_save, 
 	"app", 
diff --git a/src/main/gui/gui_main.gd b/src/main/gui/gui_main.gd
@@ -161,12 +161,23 @@ func _enter_tree():
 				screen_rect.position.y + (screen_rect.size.y - window_size.y) / 2
 			)
 			DisplayServer.window_set_position(window_position)
+
 	window.min_size = Vector2(700, 350) * Config.EDSCALE
+	if Config.REMEMBER_WINDOW_SIZE.ret():
+		var rect = Config.LAST_WINDOW_RECT.ret(Rect2i(
+			window.position,
+			window.min_size
+		)) as Rect2i
+		if DisplayServer.get_screen_from_rect(rect) != -1:
+			window.size = rect.size
+			window.position = rect.position
 
 
 func _exit_tree():
 	for callback in _on_exit_tree_callbacks:
 		callback.call()
+	var window = get_window()
+	Config.LAST_WINDOW_RECT.put(Rect2i(window.position, window.size))
 
 
 func _popup_manage_tags(item_tags, all_tags, on_confirm):
