From 66cd1b9c1561a869750b43066ebcee581078f2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Wed, 20 Sep 2023 22:17:59 +0200 Subject: [PATCH] app: use default size to save/load app size Use maximize on all platform except macos Fixes #19 --- src/app.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app.rs b/src/app.rs index 6159ceb..944f1d1 100644 --- a/src/app.rs +++ b/src/app.rs @@ -106,7 +106,12 @@ impl GPSApp { let settings = Settings::load_settings(); app.window - .set_size_request(settings.app_width, settings.app_height); + .set_default_size(settings.app_width, settings.app_height); + + #[cfg(not(target_os = "macos"))] + if settings.app_maximized { + app.window.maximize(); + } app.set_paned_position(&settings, "graph_dashboard-paned", 100); app.set_paned_position(&settings, "graph_logs-paned", 100); @@ -224,8 +229,8 @@ impl GPSApp { .expect("Couldn't get the main window"); let mut settings = Settings::load_settings(); settings.app_maximized = window.is_maximized(); - settings.app_width = window.width(); - settings.app_height = window.height(); + settings.app_width = window.default_width(); + settings.app_height = window.default_height(); app.save_paned_position(&mut settings, "graph_dashboard-paned"); app.save_paned_position(&mut settings, "graph_logs-paned"); app.save_paned_position(&mut settings, "elements_preview-paned");