Merge branch 'main' into gui-add-in-page-search

Author: roblillack

gui/src/main.rs

@@ -536,6 +536,12 @@ fn main() {
 
         wind.handle(move |win, event| match event {
             enums::Event::Move | enums::Event::Resize => {
+                // Don't update geometry while in fullscreen mode - preserve the
+                // pre-fullscreen window position for when we exit fullscreen
+                if geometry.borrow().fullscreen {
+                    return false;
+                }
+
                 if (win.x() == geometry.borrow().x)
                     && (win.y() == geometry.borrow().y)
                     && (win.width() == geometry.borrow().width)

gui/src/menu.rs

@@ -1416,6 +1416,10 @@ fn toggle_fullscreen<M: MenuExt>(
 ) {
     let entering_fullscreen = !window_geometry.borrow().fullscreen;
 
+    // Update fullscreen state early, before window changes, so that Move/Resize
+    // handlers can detect fullscreen mode and avoid overwriting the saved position
+    window_geometry.borrow_mut().fullscreen = entering_fullscreen;
+
     // Get statusbar dimensions before toggling
     let statusbar_height = statusbar.borrow().height();