fix: update Wayland maximize process condition

tauri-apps · Sep 26, 2024 · baa6877 · baa6877
1 parent 4fca9b1
commit baa6877
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/platform_impl/linux/event_loop.rs b/src/platform_impl/linux/event_loop.rs
@@ -296,7 +296,7 @@ impl<T: 'static> EventLoop<T> {
           WindowRequest::Maximized(maximized, resizable) => {
             if maximized {
               let maximize_process =
-                util::WindowMaximizeProcess::new(window.clone(), maximized, resizable);
+              util::WindowMaximizeProcess::new(window.clone(), resizable);
               glib::idle_add_local_full(glib::Priority::DEFAULT_IDLE, move || {
                 let mut maximize_process = maximize_process.borrow_mut();
                 maximize_process.next_step()

diff --git a/src/platform_impl/linux/util.rs b/src/platform_impl/linux/util.rs
@@ -77,16 +77,14 @@ pub fn set_size_constraints<W: GtkWindowExt + WidgetExt>(
 
 pub struct WindowMaximizeProcess<W: GtkWindowExt + WidgetExt> {
   window: W,
-  maximized: bool,
   resizable: bool,
   step: u8,
 }
 
 impl<W: GtkWindowExt + WidgetExt> WindowMaximizeProcess<W> {
-  pub fn new(window: W, maximized: bool, resizable: bool) -> Rc<RefCell<Self>> {
+  pub fn new(window: W, resizable: bool) -> Rc<RefCell<Self>> {
     Rc::new(RefCell::new(Self {
       window,
-      maximized,
       resizable,
       step: 0,
     }))
@@ -95,15 +93,9 @@ impl<W: GtkWindowExt + WidgetExt> WindowMaximizeProcess<W> {
   pub fn next_step(&mut self) -> glib::ControlFlow {
     match self.step {
       0 => {
-        if self.maximized {
-          self.window.set_resizable(true);
-          self.step += 1;
-          glib::ControlFlow::Continue
-        } else {
-          //It should still revert to the previous resizable state.
-          self.step = 2;
-          glib::ControlFlow::Continue
-        }
+        self.window.set_resizable(true);
+        self.step += 1;
+        glib::ControlFlow::Continue
       }
       1 => {
         self.window.maximize();

diff --git a/src/platform_impl/linux/window.rs b/src/platform_impl/linux/window.rs
@@ -112,7 +112,6 @@ impl Window {
     if attributes.maximized {
       let maximize_process = util::WindowMaximizeProcess::new(
         window.clone(),
-        attributes.maximized,
         attributes.resizable,
       );
       glib::idle_add_local_full(glib::Priority::HIGH_IDLE, move || {