From 171077ffc7314742261ca34335e190b13cb036b0 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Fri, 19 Jan 2024 16:03:24 +0100
Subject: [PATCH] window: Resize to natural on map

Only at this point we can be certain about the screen info like size an
scaling factor.
---
 src/widgets/image.rs          |  2 +-
 src/widgets/image/metadata.rs |  4 ++++
 src/window.rs                 | 21 +++++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/widgets/image.rs b/src/widgets/image.rs
index 9905b7d..5f59e8c 100644
--- a/src/widgets/image.rs
+++ b/src/widgets/image.rs
@@ -197,7 +197,7 @@ mod imp {
         /// Currently EXIF data
         pub(super) metadata: RefCell<Metadata>,
 
-        #[property(get)]
+        #[property(get=Self::image_size_available)]
         _image_size_available: bool,
 
         /// Current pointer position
diff --git a/src/widgets/image/metadata.rs b/src/widgets/image/metadata.rs
index f1ecd32..978c346 100644
--- a/src/widgets/image/metadata.rs
+++ b/src/widgets/image/metadata.rs
@@ -80,6 +80,10 @@ impl imp::LpImage {
             self.emmit_metadata_changed();
         }
     }
+
+    pub(super) fn image_size_available(&self) -> bool {
+        self.obj().image_size() > (0, 0)
+    }
 }
 
 impl LpImage {
diff --git a/src/window.rs b/src/window.rs
index 62c0e31..de90f16 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -314,6 +314,10 @@ mod imp {
                 glib::clone!(@weak obj => move |_| obj.on_fullscreen_changed()),
             );
 
+            obj.connect_map(|win| {
+                win.resize_default();
+            });
+
             self.properties_button.connect_active_notify(
                 glib::clone!(@weak obj => move |_| obj.update_headerbar_style()),
             );
@@ -374,7 +378,7 @@ mod imp {
                 "notify::image-size-available",
                 false,
                 glib::closure_local!(@watch obj => move |_: &LpImage, _: &glib::ParamSpec| {
-                    obj.image_size_ready();
+                    obj.image_size_available();
                 }),
             );
 
@@ -846,7 +850,7 @@ impl LpWindow {
         self.set_title(Some(&title));
     }
 
-    pub fn image_size_ready(&self) {
+    pub fn image_size_available(&self) {
         // if visible for whatever reason, don't do any resize
         if self.is_visible() {
             return;
@@ -858,11 +862,20 @@ impl LpWindow {
             .current_page()
             .map(|page| page.image());
 
-        if image.is_some_and(|img| img.image_size() > (0, 0)) {
+        if image.is_some_and(|img| img.image_size_available()) {
             log::debug!("Showing window because image size is ready");
+            self.present();
+        }
+    }
+
+    pub fn resize_default(&self) {
+        if self
+            .image_view()
+            .current_image()
+            .is_some_and(|img| img.image_size_available())
+        {
             // this let's the window determine the default size from LpImage's natural size
             self.set_default_size(-1, -1);
-            self.present();
         }
     }