Add Window::is_maximized method (#1804)

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- Added `is_maximized` method to `Window`.
 - On Windows, fix bug causing newly created windows to erroneously display the "wait" (spinning) cursor.
 - On Windows, change the default window size (1024x768) to match the default on other desktop platforms (800x600).
 - On Windows, fix bug causing mouse capture to not be released.

examples/fullscreen.rs

@@ -23,7 +23,6 @@ fn main() {
         _ => panic!("Please enter a valid number"),
     });
 
-    let mut is_maximized = false;
     let mut decorations = true;
 
     let window = WindowBuilder::new()
@@ -59,8 +58,8 @@ fn main() {
                         println!("window.fullscreen {:?}", window.fullscreen());
                     }
                     (VirtualKeyCode::M, ElementState::Pressed) => {
-                        is_maximized = !is_maximized;
+                        let is_maximized = window.is_maximized();
-                        window.set_maximized(is_maximized);
+                        window.set_maximized(!is_maximized);
                     }
                     (VirtualKeyCode::D, ElementState::Pressed) => {
                         decorations = !decorations;

examples/window_debug.rs

@@ -28,7 +28,6 @@ fn main() {
     eprintln!("  (X) Toggle maximized");
 
     let mut minimized = false;
-    let mut maximized = false;
     let mut visible = true;
 
     event_loop.run(move |event, _, control_flow| {
@@ -109,8 +108,8 @@ fn main() {
                         window.set_visible(visible);
                     }
                     VirtualKeyCode::X => {
-                        maximized = !maximized;
+                        let is_maximized = window.is_maximized();
-                        window.set_maximized(maximized);
+                        window.set_maximized(!is_maximized);
                     }
                     _ => (),
                 },

src/platform_impl/android/mod.rs

@@ -496,6 +496,10 @@ impl Window {
 
     pub fn set_maximized(&self, _maximized: bool) {}
 
+    pub fn is_maximized(&self) -> bool {
+        false
+    }
+
     pub fn set_fullscreen(&self, _monitor: Option<window::Fullscreen>) {
         warn!("Cannot set fullscreen on Android");
     }

src/platform_impl/ios/window.rs

@@ -190,6 +190,11 @@ impl Inner {
         warn!("`Window::set_maximized` is ignored on iOS")
     }
 
+    pub fn is_maximized(&self) -> bool {
+        warn!("`Window::is_maximized` is ignored on iOS");
+        false
+    }
+
     pub fn set_fullscreen(&self, monitor: Option<Fullscreen>) {
         unsafe {
             let uiscreen = match monitor {

src/platform_impl/linux/mod.rs

@@ -373,6 +373,12 @@ impl Window {
         x11_or_wayland!(match self; Window(w) => w.set_maximized(maximized))
     }
 
+    #[inline]
+    pub fn is_maximized(&self) -> bool {
+        // TODO: Not implemented
+        false
+    }
+
     #[inline]
     pub fn set_minimized(&self, minimized: bool) {
         x11_or_wayland!(match self; Window(w) => w.set_minimized(minimized))

src/platform_impl/macos/window.rs

@@ -730,6 +730,11 @@ impl UnownedWindow {
         shared_state_lock.fullscreen.clone()
     }
 
+    #[inline]
+    pub fn is_maximized(&self) -> bool {
+        self.is_zoomed()
+    }
+
     #[inline]
     pub fn set_fullscreen(&self, fullscreen: Option<Fullscreen>) {
         trace!("Locked shared state in `set_fullscreen`");

src/platform_impl/web/window.rs

@@ -232,6 +232,12 @@ impl Window {
         // Intentionally a no-op, as canvases cannot be 'maximized'
     }
 
+    #[inline]
+    pub fn is_maximized(&self) -> bool {
+        // Canvas cannot be 'maximized'
+        false
+    }
+
     #[inline]
     pub fn fullscreen(&self) -> Option<Fullscreen> {
         if self.canvas.borrow().is_fullscreen() {

src/platform_impl/windows/window.rs

@@ -385,6 +385,12 @@ impl Window {
         });
     }
 
+    #[inline]
+    pub fn is_maximized(&self) -> bool {
+        let window_state = self.window_state.lock();
+        window_state.window_flags.contains(WindowFlags::MAXIMIZED)
+    }
+
     #[inline]
     pub fn fullscreen(&self) -> Option<Fullscreen> {
         let window_state = self.window_state.lock();

src/platform_impl/windows/window_state.rs

@@ -34,7 +34,7 @@ pub struct WindowState {
     pub current_theme: Theme,
     pub preferred_theme: Option<Theme>,
     pub high_surrogate: Option<u16>,
-    window_flags: WindowFlags,
+    pub window_flags: WindowFlags,
 }
 
 #[derive(Clone)]

src/window.rs

@@ -597,6 +597,17 @@ impl Window {
         self.window.set_maximized(maximized)
     }
 
+    /// Gets the window's current maximized state.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Wayland / X11:** Not implemented.
+    /// - **iOS / Android / Web:** Unsupported.
+    #[inline]
+    pub fn is_maximized(&self) -> bool {
+        self.window.is_maximized()
+    }
+
     /// Sets the window to fullscreen or back.
     ///
     /// ## Platform-specific