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 eframe window position bug (pixels vs points) #2763

Merged
merged 3 commits into from
Feb 28, 2023
Merged

Fix eframe window position bug (pixels vs points) #2763

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc6090f
fix window position display error (physical pixels converted to logic…
get200 Feb 25, 2023
0a971dd
fix window position display error (physical pixels converted to logic…
get200 Feb 26, 2023
b6ffdb0
fix window position display error (physical pixels converted to logic…
get200 Feb 26, 2023
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
21 changes: 11 additions & 10 deletions crates/eframe/src/native/epi_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ pub fn read_window_info(

let monitor = window.current_monitor().is_some();
let monitor_size = if monitor {
let size = window.current_monitor().unwrap().size();
let size = window
.current_monitor()
.unwrap()
.size()
.to_logical::<f32>(pixels_per_point.into());
Some(egui::vec2(size.width as _, size.height as _))
} else {
None
Expand Down Expand Up @@ -146,15 +150,12 @@ pub fn window_builder<E>(

if *centered {
if let Some(monitor) = event_loop.available_monitors().next() {
let monitor_size = monitor.size();
let monitor_size = monitor.size().to_logical::<f64>(monitor.scale_factor());
let inner_size = inner_size_points.unwrap_or(egui::Vec2 { x: 800.0, y: 600.0 });
if monitor_size.width > 0 && monitor_size.height > 0 {
let x = (monitor_size.width - inner_size.x as u32) / 2;
let y = (monitor_size.height - inner_size.y as u32) / 2;
window_builder = window_builder.with_position(winit::dpi::LogicalPosition {
x: x as f64,
y: y as f64,
});
if monitor_size.width > 0.0 && monitor_size.height > 0.0 {
let x = (monitor_size.width - inner_size.x as f64) / 2.0;
let y = (monitor_size.height - inner_size.y as f64) / 2.0;
window_builder = window_builder.with_position(winit::dpi::LogicalPosition { x, y });
}
}
}
Expand Down Expand Up @@ -254,7 +255,7 @@ pub fn handle_app_output(
}

if let Some(window_pos) = window_pos {
window.set_outer_position(winit::dpi::PhysicalPosition {
window.set_outer_position(winit::dpi::LogicalPosition {
x: window_pos.x as f64,
y: window_pos.y as f64,
});
Expand Down