migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 13:50:04 -04:00
Code Activity

Revert "Now in screen_rect min is the viewport position and max is the viewport size"

Browse Source 
This reverts commit 4bbdab1788.
This commit is contained in:
Konkitoman
2023-08-24 07:55:56 +03:00
parent c9faa78e5b
commit 9c73c2f4b1
15 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/egui-winit/src/lib.rs
View File

@@ -16,7 +16,7 @@ pub use accesskit_winit;
pub use egui;
#[cfg(feature = "accesskit")]
use egui::accesskit;
use egui::{mutex::RwLock, Pos2, ViewportBuilder, ViewportCommand, ViewportId};
use egui::{mutex::RwLock, ViewportBuilder, ViewportCommand, ViewportId};
pub use winit;
pub mod clipboard;
@@ -176,16 +176,16 @@ impl State {
// This solves an issue where egui window positions would be changed when minimizing on Windows.
let screen_size_in_pixels = screen_size_in_pixels(window);
let screen_size_in_points = screen_size_in_pixels / pixels_per_point;
self.egui_input.screen_rect = if !window.is_minimized().unwrap_or_else(|| {
let getting_info = !window.is_minimized().unwrap_or_else(|| {
eprintln!("Cannot determine the Viewport/native window minimized state");
true
}) {
Some(egui::Rect::from_min_max(
window
.outer_position()
.map(|pos| Pos2::new(pos.x as f32, pos.y as f32))
.unwrap_or(Pos2::ZERO),
screen_size_in_points.to_pos2(),
});
self.egui_input.screen_rect = if getting_info {
Some(egui::Rect::from_min_size(
egui::Pos2::ZERO,
screen_size_in_points,
))
} else {
None