CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-07-24 17:20:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(window-state): Ignore is_maximized state in resize events on macos (#2007)

Browse Source
This commit is contained in:
Fabian-Lars
2024-11-05 17:01:35 +01:00
committed by GitHub
parent b8bf4ad360
commit cfb3ec0e21
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changes/window-state-disable-maximize-check.md
+5
View File
@@ -0,0 +1,5 @@
---
window-state: patch
---
On macOS the plugin now (temporarily) ignores the maximized state for undecorated windows on resize events to fix app freezes.
plugins/window-state/src/lib.rs
+16 -6
View File
@@ -471,13 +471,23 @@ impl Builder {
.0 .0
.try_lock() .try_lock()
.is_ok() .is_ok()
&& !window_clone.is_minimized().unwrap_or_default()
&& !window_clone.is_maximized().unwrap_or_default()
{ {
let mut c = cache.lock().unwrap(); // TODO: Remove once https://github.com/tauri-apps/tauri/issues/5812 is resolved.
if let Some(state) = c.get_mut(&label) { let is_maximized = if cfg!(target_os = "macos")
state.width = size.width; && (!window_clone.is_decorated().unwrap_or_default()
state.height = size.height; || !window_clone.is_resizable().unwrap_or_default())
{
false
} else {
window_clone.is_maximized().unwrap_or_default()
};
if !window_clone.is_minimized().unwrap_or_default() && !is_maximized {
let mut c = cache.lock().unwrap();
if let Some(state) = c.get_mut(&label) {
state.width = size.width;
state.height = size.height;
}
} }
} }
} }