Skip to content
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

Fix persistence of window position #1745

Merged
merged 3 commits into from
Jun 19, 2022
Merged

Fix persistence of window position #1745

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19d23f0
Fix window position
Barugon Jun 16, 2022
c8a9752
Better comment
Barugon Jun 16, 2022
0ffc204
Add doc link
Barugon Jun 16, 2022
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
24 changes: 17 additions & 7 deletions egui-winit/src/window_settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,32 @@
#[derive(Clone, Copy, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
pub struct WindowSettings {
/// Inner position of window in physical pixels
inner_pos: Option<egui::Pos2>,
/// Position of window in physical pixels. This is either
/// the inner or outer position depending on the platform.
position: Option<egui::Pos2>,
/// Inner size of window in logical pixels
inner_size_points: Option<egui::Vec2>,
}

impl WindowSettings {
pub fn from_display(window: &winit::window::Window) -> Self {
let inner_size_points = window.inner_size().to_logical::<f32>(window.scale_factor());

Self {
inner_pos: window
let position = if cfg!(macos) {
// Use the inner position for MacOS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, it is better to wording like "MacOS uses inner position when positioning windows" or something, added details from your findings also would be helpful.

Right now this comment looks like Captain Obvious statement.

window
.inner_position()
.ok()
.map(|p| egui::pos2(p.x as f32, p.y as f32)),
.map(|p| egui::pos2(p.x as f32, p.y as f32))
} else {
// Other platforms use the outer position.
window
.outer_position()
.ok()
.map(|p| egui::pos2(p.x as f32, p.y as f32))
};

Self {
position,
inner_size_points: Some(egui::vec2(
inner_size_points.width as f32,
inner_size_points.height as f32,
Expand All @@ -35,7 +45,7 @@ impl WindowSettings {
// If this happens on Mac, the window is clamped into valid area.
// If this happens on Windows, the window is hidden and very difficult to find.
// So we don't restore window positions on Windows.
if let Some(pos) = self.inner_pos {
if let Some(pos) = self.position {
window = window.with_position(winit::dpi::PhysicalPosition {
x: pos.x as f64,
y: pos.y as f64,
Expand Down