Update egui to laters master

Author: lucasmerlin

Cargo.lock

@@ -1973,8 +1973,6 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 [[package]]
 name = "ecolor"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878e9005799dd739e5d5d89ff7480491c12d0af571d44399bcaefa1ee172dd76"
 dependencies = [
  "bytemuck",
  "color-hex",
@@ -1991,8 +1989,6 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
 [[package]]
 name = "eframe"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba4c50d905804fe9ec4e159fde06b9d38f9440228617ab64a03d7a2091ece63"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2031,8 +2027,6 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d2768eaa6d5c80a6e2a008da1f0e062dff3c83eb2b28605ea2d0732d46e74d6"
 dependencies = [
  "accesskit",
  "ahash",
@@ -2050,8 +2044,6 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d8151704bcef6271bec1806c51544d70e79ef20e8616e5eac01facfd9c8c54a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2070,8 +2062,6 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace791b367c1f63e6044aef2f3834904509d1d1a6912fd23ebf3f6a9af92cd84"
 dependencies = [
  "accesskit_winit",
  "ahash",
@@ -2114,8 +2104,6 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b5cf69510eb3d19211fc0c062fb90524f43fe8e2c012967dcf0e2d81cb040f"
 dependencies = [
  "ahash",
  "egui",
@@ -2132,8 +2120,6 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a53e2374a964c3c793cb0b8ead81bca631f24974bc0b747d1a5622f4e39fdd0"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2150,8 +2136,6 @@ dependencies = [
 [[package]]
 name = "egui_kittest"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a9133e9f6601f7c74edc78dd46b24034bbcf1b99f1bf268ef7b65cf09560ab"
 dependencies = [
  "dify",
  "eframe",
@@ -2222,8 +2206,6 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "emath"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55b7b6be5ad1d247f11738b0e4699d9c20005ed366f2c29f5ec1f8e1de180bc2"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2339,8 +2321,6 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "275b665a7b9611d8317485187e5458750850f9e64604d3c58434bb3fc1d22915"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -2359,8 +2339,6 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9343d356d7cac894dacafc161b4654e0881301097bdf32a122ed503d97cb94b6"
 
 [[package]]
 name = "equivalent"

Cargo.toml

@@ -596,22 +596,22 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
 # Prefer patching with `branch` over `rev` and let `Cargo.lock` handle the commit hash.
 # That makes it easy to upade with `cargo update -p $CRATE`.
 
-# ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
-# emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
+#ecolor = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#eframe = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#egui = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#egui_extras = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
+#emath = { git = "https://github.com/emilk/egui.git", branch = "lucas/popup-based-menu" }
 
 # Useful while developing:
-# ecolor = { path = "../../egui/crates/ecolor" }
-# eframe = { path = "../../egui/crates/eframe" }
-# egui = { path = "../../egui/crates/egui" }
-# egui_extras = { path = "../../egui/crates/egui_extras" }
-# egui_kittest = { path = "../../egui/crates/egui_kittest" }
-# egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
-# emath = { path = "../../egui/crates/emath" }
+ ecolor = { path = "../egui/crates/ecolor" }
+ eframe = { path = "../egui/crates/eframe" }
+ egui = { path = "../egui/crates/egui" }
+ egui_extras = { path = "../egui/crates/egui_extras" }
+ egui_kittest = { path = "../egui/crates/egui_kittest" }
+ egui-wgpu = { path = "../egui/crates/egui-wgpu" }
+ emath = { path = "../egui/crates/emath" }
 
 egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "main" } # 2025-02-20 - everything is id identified, allowing for instance reading out hidden items reliable
 # egui_plot = { path = "../../egui_plot/egui_plot" }

crates/viewer/re_blueprint_tree/src/blueprint_tree.rs

@@ -1141,7 +1141,7 @@ fn add_new_view_or_container_menu_button(
         ))
         .clicked()
     {
-        ui.close_menu();
+        ui.close();
 
         // If a single container is selected, we use it as target. Otherwise, we target the
         // root container.
@@ -1192,7 +1192,7 @@ fn set_blueprint_to_default_menu_buttons(ctx: &ViewerContext<'_>, ui: &mut egui:
     };
 
     if response.clicked() {
-        ui.close_menu();
+        ui.close();
         ctx.command_sender()
             .send_system(re_viewer_context::SystemCommand::ClearActiveBlueprint);
     }
@@ -1214,7 +1214,7 @@ fn set_blueprint_to_auto_menu_button(ctx: &ViewerContext<'_>, ui: &mut egui::Ui)
         .on_hover_text("Re-populate viewport with automatically chosen views")
         .clicked()
     {
-        ui.close_menu();
+        ui.close();
         ctx.command_sender()
             .send_system(re_viewer_context::SystemCommand::ClearActiveBlueprintAndEnableHeuristics);
     }

crates/viewer/re_context_menu/src/actions/add_entities_to_new_view.rs

@@ -51,7 +51,7 @@ impl ContextMenuAction for AddEntitiesToNewViewAction {
                         let btn = egui::Button::image_and_text(class.icon(), class.display_name());
                         if ui.add(btn).clicked() {
                             create_view_for_selected_entities(ctx, *identifier);
-                            ui.close_menu();
+                            ui.close();
                         }
                     }
                 };

crates/viewer/re_context_menu/src/lib.rs

@@ -85,7 +85,7 @@ fn context_menu_ui_for_item_with_context_impl(
 ) {
     item_response.context_menu(|ui| {
         if ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
-            ui.close_menu();
+            ui.close();
             return;
         }
 
@@ -225,7 +225,7 @@ fn show_context_menu_for_selection(ctx: &ContextMenuContext<'_>, ui: &mut egui::
 
             let response = action.ui(ctx, ui);
             if response.clicked() {
-                ui.close_menu();
+                ui.close();
             }
         }
 

crates/viewer/re_context_menu/src/sub_menu.rs

@@ -31,7 +31,7 @@ impl ContextMenuAction for SubMenu {
 
                 let response = action.ui(ctx, ui);
                 if response.clicked() {
-                    ui.close_menu();
+                    ui.close();
                 }
             }
         })

crates/viewer/re_selection_panel/src/defaults_ui.rs

@@ -321,7 +321,7 @@ fn add_popup_ui(
                 }
             }
 
-            ui.close_menu();
+            ui.close();
         }
     }
 }

crates/viewer/re_selection_panel/src/visualizer_ui.rs

@@ -460,7 +460,7 @@ fn menu_more(
         .clicked()
     {
         ctx.clear_blueprint_component_by_name(override_path, component_name);
-        ui.close_menu();
+        ui.close();
     }
 
     if ui
@@ -474,12 +474,12 @@ fn menu_more(
         if let Some(raw_default) = raw_default {
             ctx.save_blueprint_array(override_path, component_name, raw_default);
         }
-        ui.close_menu();
+        ui.close();
     }
 
     if ui.button("Set to fallback value").clicked() {
         ctx.save_blueprint_array(override_path, component_name, raw_fallback);
-        ui.close_menu();
+        ui.close();
     }
 
     let override_differs_from_default = raw_override
@@ -496,7 +496,7 @@ fn menu_more(
         .clicked()
     {
         ctx.reset_blueprint_component_by_name(override_path, component_name);
-        ui.close_menu();
+        ui.close();
     }
 
     if ui.button("Make default for current view").clicked() {
@@ -505,7 +505,7 @@ fn menu_more(
             component_name,
             raw_current_value,
         );
-        ui.close_menu();
+        ui.close();
     }
 }
 
@@ -536,7 +536,7 @@ fn menu_add_new_visualizer(
 
             ctx.save_blueprint_component(override_path, &component);
 
-            ui.close_menu();
+            ui.close();
         }
     }
 }

crates/viewer/re_ui/src/command.rs

@@ -480,7 +480,7 @@ impl UICommand {
 
         if response.clicked() {
             command_sender.send_ui(self);
-            ui.close_menu();
+            ui.close();
         }
 
         response

crates/viewer/re_view/src/view_property_ui.rs

@@ -212,7 +212,7 @@ If no default blueprint was set or it didn't set any value for this field, this
         );
     if response.clicked() {
         ctx.reset_blueprint_component_by_name(&property.blueprint_store_path, component_name);
-        ui.close_menu();
+        ui.close();
     }
 
     let response = ui
@@ -227,7 +227,7 @@ This has the same effect as not setting the value in the blueprint at all."
         .on_disabled_hover_text("The property is already unset.");
     if response.clicked() {
         ctx.clear_blueprint_component_by_name(&property.blueprint_store_path, component_name);
-        ui.close_menu();
+        ui.close();
     }
 
     // TODO(andreas): The next logical thing here is now to save it to the default blueprint!

crates/viewer/re_viewer/src/ui/rerun_menu.rs

@@ -1,6 +1,7 @@
 //! The main Rerun drop-down menu found in the top panel.
 
-use egui::NumExt as _;
+use egui::containers::menu::MenuConfig;
+use egui::{NumExt as _, PopupCloseBehavior};
 
 use re_ui::UICommand;
 use re_viewer_context::StoreContext;
@@ -98,17 +99,19 @@ impl App {
         backend_menu_ui(&self.command_sender, ui, render_state);
 
         #[cfg(debug_assertions)]
-        ui.menu_button("Debug", |ui| {
-            ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
-            debug_menu_options_ui(ui, &mut self.state.app_options, &self.command_sender);
-
-            ui.label("egui debug options:");
-            ui.weak(format!(
-                "pixels_per_point: {:?}",
-                ui.ctx().pixels_per_point()
-            ));
-            egui_debug_options_ui(ui);
-        });
+        egui::containers::menu::SubMenuButton::new("Debug")
+            .config(MenuConfig::new().close_behavior(PopupCloseBehavior::CloseOnClickOutside))
+            .ui(ui, |ui| {
+                ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
+                debug_menu_options_ui(ui, &mut self.state.app_options, &self.command_sender);
+
+                ui.label("egui debug options:");
+                ui.weak(format!(
+                    "pixels_per_point: {:?}",
+                    ui.ctx().pixels_per_point()
+                ));
+                egui_debug_options_ui(ui);
+            });
 
         ui.add_space(SPACING);
 
@@ -201,7 +204,7 @@ impl App {
                     .on_hover_text("Save all data to a Rerun data file (.rrd)")
                     .clicked()
                 {
-                    ui.close_menu();
+                    ui.close();
                     self.command_sender.send_ui(UICommand::SaveRecording);
                 }
 
@@ -218,7 +221,7 @@ impl App {
                     )
                     .clicked()
                 {
-                    ui.close_menu();
+                    ui.close();
                     self.command_sender
                         .send_ui(UICommand::SaveRecordingSelection);
                 }
@@ -387,7 +390,7 @@ fn debug_menu_options_ui(
                 .send_viewport_cmd(egui::ViewportCommand::Fullscreen(false));
             ui.ctx()
                 .send_viewport_cmd(egui::ViewportCommand::InnerSize(size));
-            ui.close_menu();
+            ui.close();
         }
     }
 

crates/viewer/re_viewer/src/ui/top_panel.rs

@@ -45,7 +45,7 @@ pub fn top_panel(
             }
         }
 
-        egui::menu::bar(ui, |ui| {
+        egui::containers::menu::Bar::new().ui(ui, |ui| {
             ui.set_height(top_bar_style.height);
             ui.add_space(top_bar_style.indent);