Skip to content

fix(window-state): The window size state needs to be related to the screen's scale_factor. #2505

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

Closed
wants to merge 2 commits into from
Closed

fix(window-state): The window size state needs to be related to the screen's scale_factor. #2505

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
1e13fc1
fix(window-state): The window size state needs to be related to the s…
muwoo Mar 7, 2025
55fbf3a
fix: The window size state needs to be related to the screen's scale_…
muwoo Mar 7, 2025
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
5 changes: 5 additions & 0 deletions .changes/window-state-size-scale-factor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
window-state: patch
---

fix: The window size state needs to be related to the screen's scale_factor, Otherwise, the restored window size will be scaled relative to the previous state.
24 changes: 17 additions & 7 deletions plugins/window-state/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use bitflags::bitflags;
use serde::{Deserialize, Serialize};
use tauri::{
plugin::{Builder as PluginBuilder, TauriPlugin},
Manager, Monitor, PhysicalPosition, PhysicalSize, RunEvent, Runtime, WebviewWindow, Window,
LogicalSize, Manager, Monitor, PhysicalPosition, PhysicalSize, RunEvent, Runtime, WebviewWindow, Window,
WindowEvent,
};

Expand Down Expand Up @@ -184,7 +184,7 @@ impl<R: Runtime> WindowExt for Window<R> {
}

if flags.contains(StateFlags::SIZE) {
self.set_size(PhysicalSize {
self.set_size(LogicalSize {
width: state.width,
height: state.height,
})?;
Expand Down Expand Up @@ -224,9 +224,12 @@ impl<R: Runtime> WindowExt for Window<R> {
should_show = state.visible;
} else {
let mut metadata = WindowState::default();

if flags.contains(StateFlags::SIZE) {
let size = self.inner_size()?;
let scale_factor = self
.current_monitor()?
.map(|m| m.scale_factor())
.unwrap_or(1.);
let size = self.inner_size()?.to_logical(scale_factor);
metadata.width = size.width;
metadata.height = size.height;
}
Expand Down Expand Up @@ -300,7 +303,12 @@ impl<R: Runtime> WindowExtInternal for Window<R> {
}

if flags.contains(StateFlags::SIZE) && !is_maximized && !is_minimized {
let size = self.inner_size()?;
let scale_factor = self
.current_monitor()?
.map(|m| m.scale_factor())
.unwrap_or(1.);
let size = self.inner_size()?.to_logical(scale_factor);

// 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;
Expand Down Expand Up @@ -523,11 +531,13 @@ impl Builder {
}

trait MonitorExt {
fn intersects(&self, position: PhysicalPosition<i32>, size: PhysicalSize<u32>) -> bool;
fn intersects(&self, position: PhysicalPosition<i32>, size: LogicalSize<u32>) -> bool;
}

impl MonitorExt for Monitor {
fn intersects(&self, position: PhysicalPosition<i32>, size: PhysicalSize<u32>) -> bool {
fn intersects(&self, position: PhysicalPosition<i32>, size: LogicalSize<u32>) -> bool {
let size = size.to_physical::<u32>(self.scale_factor());

let PhysicalPosition { x, y } = *self.position();
let PhysicalSize { width, height } = *self.size();

Expand Down