From 85489dc1dda21a87713bbc137603021f08b90072 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 23 Nov 2023 09:22:10 +0100 Subject: [PATCH] Fix deadlock on `custom_window_frame` (#3612) * Reverts commit e037489 (https://github.com/emilk/egui/pull/3601) * Reopens https://github.com/emilk/egui/issues/3494 It caused a deadlock on Mac when running `custom_window_frame` --- crates/egui-winit/src/lib.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs index b0461b8b..fa454b08 100644 --- a/crates/egui-winit/src/lib.rs +++ b/crates/egui-winit/src/lib.rs @@ -836,12 +836,18 @@ fn update_viewport_info(viewport_info: &mut ViewportInfo, window: &Window, pixel viewport_info.focused = Some(window.has_focus()); viewport_info.fullscreen = Some(window.fullscreen().is_some()); viewport_info.inner_rect = inner_rect; - viewport_info.maximized = Some(window.is_maximized()); - viewport_info.minimized = window.is_minimized().or(viewport_info.minimized); viewport_info.monitor_size = monitor_size; viewport_info.native_pixels_per_point = Some(window.scale_factor() as f32); viewport_info.outer_rect = outer_rect; viewport_info.title = Some(window.title()); + + if false { + // It's tempting to do this, but it leads to a deadlock on Mac when running + // `cargo run -p custom_window_frame`. + // See https://github.com/emilk/egui/issues/3494 + viewport_info.maximized = Some(window.is_maximized()); + viewport_info.minimized = window.is_minimized().or(viewport_info.minimized); + } } fn open_url_in_browser(_url: &str) {