Update egui to 0.33

Cargo.toml

@@ -13,6 +13,7 @@ inherits = "release"
 # Use core libs from path for local development, and version when publishing.
 maps_io_ros = { path = "crates/maps_io_ros", version = "0.1.0" }
 maps_rendering = { path = "crates/maps_rendering", version = "0.1.0" }
+eframe = {version = "0.33.0", features = ["wgpu"] }
 image = { version = "0.25.5", features = ["jpeg", "png", "pnm"] }
 imageproc = "0.25.0"
 lazy_static = "1.5.0"

crates/maps/Cargo.toml

@@ -24,18 +24,18 @@ default = ["kittest_snapshots"]
 built = { version = "0.7.5", features = ["git2"] }
 
 [dev-dependencies]
-egui_kittest = { version = "0.32.0", features = ["wgpu", "snapshot", "eframe"] }
+egui_kittest = { version = "0.33.0", features = ["wgpu", "snapshot", "eframe"] }
 
 # Dependencies of the main app crate.
 [dependencies]
 maps_io_ros = { workspace = true }
 maps_rendering = { workspace = true }
 confy = "0.6.1"
-eframe = {version = "0.32.1", features = ["wgpu"]}
-egui_dnd = "0.13.0"
-egui-file-dialog = "0.11.0"
-egui_plot = "0.33.0"
-egui_tiles = "0.13.0"
+eframe = { workspace = true }
+egui_dnd = "0.14.0"
+egui-file-dialog = "0.12.0"
+egui_plot = "0.34.0"
+egui_tiles = "0.14.0"
 image = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }

crates/maps/src/app_impl/keys.rs

@@ -7,12 +7,13 @@ use crate::movable::{DragDirection, Draggable, MovableAmounts, Rotatable};
 
 impl AppState {
     fn dialogs_open(&self) -> bool {
-        self.load_meta_file_dialog.state() == DialogState::Open
-            || self.load_map_pose_file_dialog.state() == DialogState::Open
-            || self.save_map_pose_file_dialog.state() == DialogState::Open
-            || self.load_session_file_dialog.state() == DialogState::Open
-            || self.save_session_file_dialog.state() == DialogState::Open
-            || self.save_screenshot_dialog.state() == DialogState::Open
+        // TODO: track this in a less stupid way.
+        *self.load_meta_file_dialog.state() == DialogState::Open
+            || *self.load_map_pose_file_dialog.state() == DialogState::Open
+            || *self.save_map_pose_file_dialog.state() == DialogState::Open
+            || *self.load_session_file_dialog.state() == DialogState::Open
+            || *self.save_session_file_dialog.state() == DialogState::Open
+            || *self.save_screenshot_dialog.state() == DialogState::Open
             || self.status.quit_modal_active
             || !self.status.error.is_empty()
     }

crates/maps/src/lens.rs

@@ -191,8 +191,8 @@ impl<'a> Lens<'a> {
     fn bounce_pos(ui: &egui::Ui, pointer_pos: egui::Pos2, overlay_size: egui::Vec2) -> egui::Pos2 {
         let offset = overlay_size / 2. + egui::vec2(10., 10.);
         let window_uv = egui::vec2(
-            pointer_pos.x / ui.ctx().screen_rect().width(),
-            pointer_pos.y / ui.ctx().screen_rect().height(),
+            pointer_pos.x / ui.ctx().content_rect().width(),
+            pointer_pos.y / ui.ctx().content_rect().height(),
         );
 
         if window_uv.x < 0.5 && window_uv.y < 0.5 {

crates/maps_io_ros/Cargo.toml

@@ -12,7 +12,7 @@ rust-version = "1.88.0"
 readme = "README.md"
 
 [dependencies]
-emath = { version = "0.32.1", features = ["serde"] }
+emath = { version = "0.33.0", features = ["serde"] }
 image = { workspace = true }
 imageproc = { workspace = true }
 lazy_static = { workspace = true }

crates/maps_rendering/Cargo.toml

@@ -12,7 +12,7 @@ rust-version = "1.88.0"
 readme = "README.md"
 
 [dependencies]
-eframe = {version = "0.32.1", features = ["wgpu"]}
+eframe = { workspace = true }
 fast_image_resize = { version = "5.3.0", features = ["image"] }
 image = { workspace = true }
 imageproc = { workspace = true }