Use MenuButton instead of SubMenuButton

rerun-io · Mar 3, 2025 · b52f513 · b52f513
1 parent 4e87bc4
commit b52f513
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/crates/viewer/re_ui/src/list_item/item_button.rs b/crates/viewer/re_ui/src/list_item/item_button.rs
@@ -1,7 +1,7 @@
 //! Abstraction for buttons to be used in list items.
 
 use crate::{Icon, UiExt as _};
-use egui::containers::menu::SubMenuButton;
+use egui::containers::menu::MenuButton;
 
 // -------------------------------------------------------------------------------------------------
 
@@ -52,9 +52,8 @@ impl super::ItemButton for ItemMenuButton<'_> {
         ui.add_enabled_ui(self.enabled, |ui| {
             ui.spacing_mut().item_spacing = egui::Vec2::ZERO;
 
-            let (mut response, _) =
-                SubMenuButton::from_button(ui.small_icon_button_widget(self.icon))
-                    .ui(ui, self.add_contents);
+            let (mut response, _) = MenuButton::from_button(ui.small_icon_button_widget(self.icon))
+                .ui(ui, self.add_contents);
             if let Some(hover_text) = self.hover_text {
                 response = response.on_hover_text(hover_text);
             }

diff --git a/crates/viewer/re_view_dataframe/src/view_query/ui.rs b/crates/viewer/re_view_dataframe/src/view_query/ui.rs
@@ -1,4 +1,6 @@
-use egui::containers::menu::SubMenuButton;
+use crate::view_query::Query;
+use egui::containers::menu::{MenuButton, MenuConfig};
+use egui::PopupCloseBehavior;
 use re_chunk_store::{ColumnDescriptor, ColumnSelector};
 use re_log_types::{
     EntityPath, ResolvedTimeRange, TimeInt, TimeType, TimeZone, Timeline, TimelineName,
@@ -9,8 +11,6 @@ use re_ui::{list_item, UiExt};
 use re_viewer_context::{TimeDragValue, ViewId, ViewSystemExecutionError, ViewerContext};
 use std::collections::{BTreeSet, HashSet};
 
-use crate::view_query::Query;
-
 // UI implementation
 impl Query {
     pub(super) fn timeline_ui(
@@ -434,11 +434,16 @@ impl Query {
 
         ui.list_item_flat_noninteractive(list_item::PropertyContent::new("Columns").value_fn(
             |ui, _| {
-                SubMenuButton::new(&visible_count_label).ui(ui, |ui| {
-                    egui::ScrollArea::vertical()
-                        .auto_shrink([false, false])
-                        .show(ui, modal_ui)
-                });
+                MenuButton::new(&visible_count_label)
+                    .config(
+                        MenuConfig::default()
+                            .close_behavior(PopupCloseBehavior::CloseOnClickOutside),
+                    )
+                    .ui(ui, |ui| {
+                        egui::ScrollArea::vertical()
+                            .auto_shrink([false, false])
+                            .show(ui, modal_ui)
+                    });
             },
         ));