From a87fce102d020f1dd87c4179ac3ee052a179f638 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Fri, 14 Feb 2025 16:56:36 -0500 Subject: [PATCH] Avoid egui feature unsupported on wayland --- src/window/game.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/window/game.rs b/src/window/game.rs index dd83dc5..b3406bc 100644 --- a/src/window/game.rs +++ b/src/window/game.rs @@ -142,8 +142,7 @@ impl GameWindow { fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) { ui.menu_button("Video", |ui| { ui.menu_button("Screen Size", |ui| { - let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap()); - let current_dims = current_dims.max - current_dims.min; + let current_dims = self.config.dimensions; for scale in 1..=4 { let label = format!("x{scale}"); @@ -183,10 +182,7 @@ impl GameWindow { return; } - let current_dims = { - let viewport = ctx.input(|i| i.viewport().inner_rect.unwrap()); - viewport.max - viewport.min - }; + let current_dims = self.config.dimensions; let new_proportions = display_mode.proportions(); let scale = new_proportions / old_proportions; if scale != Vec2::new(1.0, 1.0) { @@ -330,7 +326,7 @@ impl AppWindow for GameWindow { fn show(&mut self, ctx: &Context) { let dimensions = { - let bounds = ctx.input(|i| i.viewport().inner_rect.unwrap()); + let bounds = ctx.available_rect(); bounds.max - bounds.min }; self.update_config(|c| c.dimensions = dimensions);