Skip to content

fix(window-state): convert macOS coordinates to Logical to fix overlay shrink and multi-monitor DPI scaling drift #3416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gkucmierz wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

fix(window-state): convert macOS coordinates to Logical to fix overlay shrink and multi-monitor DPI scaling drift #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3755f3d
fix(window-state): convert macOS coordinates to Logical to fix overla…
gkucmierz May 9, 2026
a0b839b
chore: add changeset for logical coordinates and macOS overlay fix
gkucmierz May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/window-state-macos-logical-coordinates.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-plugin-window-state": patch
"@tauri-apps/plugin-window-state": patch
---

Refactored state restoration and window caching to use `Logical` coordinates instead of `Physical`, resolving scaling drift and position anomalies across multi-monitor setups on macOS. Implemented a specific heuristic to compensate for `titleBarStyle: Overlay` causing cascading window shrinkage.
94 changes: 61 additions & 33 deletions plugins/window-state/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,33 +187,29 @@ impl<R: Runtime> WindowExt for Window<R> {
}

if flags.contains(StateFlags::POSITION) {
let position = (state.x, state.y).into();
let size = (state.width, state.height).into();
// restore position to saved value if saved monitor exists
// otherwise, let the OS decide where to place the window
let logical_pos = tauri::LogicalPosition::new(state.x, state.y);
let logical_size = tauri::LogicalSize::new(state.width, state.height);

for m in self.available_monitors()? {
if m.intersects(position, size) {
self.set_position(PhysicalPosition {
x: if state.maximized {
state.prev_x
} else {
state.x
},
y: if state.maximized {
state.prev_y
} else {
state.y
},
})?;
let scale = m.scale_factor();
let phys_pos = logical_pos.to_physical::<i32>(scale);
let phys_size = logical_size.to_physical::<u32>(scale);

if m.intersects(phys_pos, phys_size) {
let x_pos = if state.maximized { state.prev_x } else { state.x };
let y_pos = if state.maximized { state.prev_y } else { state.y };

self.set_position(tauri::Position::Logical(tauri::LogicalPosition::new(x_pos as f64, y_pos as f64).into()))?;
break;
}
}
}

if flags.contains(StateFlags::SIZE) {
self.set_size(PhysicalSize {
width: state.width,
height: state.height,
})?;
self.set_size(tauri::Size::Logical(tauri::LogicalSize::new(
state.width as f64,
state.height as f64,
).into()))?;
}

if flags.contains(StateFlags::MAXIMIZED) && state.maximized {
Expand All @@ -229,13 +225,15 @@ impl<R: Runtime> WindowExt for Window<R> {
let mut metadata = WindowState::default();

if flags.contains(StateFlags::SIZE) {
let size = self.inner_size()?;
let scale = self.scale_factor().unwrap_or(1.0);
let size = self.inner_size()?.to_logical::<u32>(scale);
metadata.width = size.width;
metadata.height = size.height;
}

if flags.contains(StateFlags::POSITION) {
let pos = self.outer_position()?;
let scale = self.scale_factor().unwrap_or(1.0);
let pos = self.outer_position()?.to_logical::<i32>(scale);
metadata.x = pos.x;
metadata.y = pos.y;
}
Expand Down Expand Up @@ -303,16 +301,30 @@ impl<R: Runtime> WindowExtInternal for Window<R> {
}

if flags.contains(StateFlags::SIZE) && !is_maximized && !is_minimized {
let size = self.inner_size()?;
// It doesn't make sense to save a window with 0 height or width
if size.width > 0 && size.height > 0 {
state.width = size.width;
state.height = size.height;
let scale = self.scale_factor().unwrap_or(1.0);
let mut logical_size = self.inner_size()?.to_logical::<u32>(scale);

#[cfg(target_os = "macos")]
{
if let Ok(outer) = self.outer_size() {
let outer_logical = outer.to_logical::<u32>(scale);
let diff = outer_logical.height.saturating_sub(logical_size.height);
if diff >= 20 && diff <= 40 {
logical_size.height = outer_logical.height;
logical_size.width = outer_logical.width;
}
}
}

if logical_size.width > 0 && logical_size.height > 0 {
state.width = logical_size.width;
state.height = logical_size.height;
}
}

if flags.contains(StateFlags::POSITION) && !is_maximized && !is_minimized {
let position = self.outer_position()?;
let scale = self.scale_factor().unwrap_or(1.0);
let position = self.outer_position()?.to_logical::<i32>(scale);
state.x = position.x;
state.y = position.y;
}
Expand Down Expand Up @@ -462,11 +474,13 @@ impl Builder {
{
let mut c = cache.lock().unwrap();
if let Some(state) = c.get_mut(&label) {
let scale = window_clone.scale_factor().unwrap_or(1.0);
let logical_pos = position.to_logical::<i32>(scale);
state.prev_x = state.x;
state.prev_y = state.y;

state.x = position.x;
state.y = position.y;
state.x = logical_pos.x;
state.y = logical_pos.y;
}
}
}
Expand All @@ -490,8 +504,22 @@ impl Builder {
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;
let scale = window_clone.scale_factor().unwrap_or(1.0);
let mut logical_size = size.to_logical::<u32>(scale);

#[cfg(target_os = "macos")]
{
if let Ok(outer) = window_clone.outer_size() {
let outer_logical = outer.to_logical::<u32>(scale);
let diff = outer_logical.height.saturating_sub(logical_size.height);
if diff >= 20 && diff <= 40 {
logical_size.height = outer_logical.height;
logical_size.width = outer_logical.width;
}
}
}
state.width = logical_size.width;
state.height = logical_size.height;
}
}
}
Expand Down
Loading