Update stuff

Author: lucasmerlin

crates/viewer/re_time_panel/src/data_density_graph.rs

@@ -6,7 +6,7 @@
 use std::sync::Arc;
 
 use egui::emath::Rangef;
-use egui::{epaint::Vertex, lerp, pos2, remap, Color32, NumExt as _, Rect, Shape};
+use egui::{epaint::Vertex, lerp, pos2, remap, Color32, NumExt as _, Rect, Shape, Tooltip};
 
 use re_chunk_store::Chunk;
 use re_chunk_store::RangeQuery;
@@ -421,14 +421,16 @@ pub fn data_density_graph_ui(
             if ui.ctx().dragged_id().is_none() {
                 // TODO(jprochazk): check chunk.num_rows() and chunk.timeline.is_sorted()
                 //                  if too many rows and unsorted, show some generic error tooltip (=too much data)
-                egui::show_tooltip_at_pointer(
-                    ui.ctx(),
-                    ui.layer_id(),
+                Tooltip::new(
                     egui::Id::new("data_tooltip"),
-                    |ui| {
-                        show_row_ids_tooltip(ctx, ui, time_ctrl, db, item, hovered_time);
-                    },
-                );
+                    ui.ctx().clone(),
+                    egui::PopupAnchor::Pointer,
+                    ui.layer_id(),
+                )
+                .gap(12.0)
+                .show(|ui| {
+                    show_row_ids_tooltip(ctx, ui, time_ctrl, db, item, hovered_time);
+                });
             }
         }
     }

crates/viewer/re_ui/examples/re_ui_example/main.rs

@@ -2,6 +2,7 @@ mod drag_and_drop;
 mod hierarchical_drag_and_drop;
 mod right_panel;
 
+use egui::containers::menu;
 use egui::Modifiers;
 use re_ui::filter_widget::format_matching_text;
 use re_ui::{
@@ -412,7 +413,7 @@ impl ExampleApp {
                     }
                 }
 
-                egui::menu::bar(ui, |ui| {
+                menu::Bar::new().ui(ui, |ui| {
                     ui.set_height(top_bar_style.height);
                     ui.add_space(top_bar_style.indent);
 

crates/viewer/re_ui/src/list_item/item_button.rs

@@ -1,6 +1,7 @@
 //! Abstraction for buttons to be used in list items.
 
 use crate::{Icon, UiExt as _};
+use egui::containers::menu::SubMenuButton;
 
 // -------------------------------------------------------------------------------------------------
 
@@ -51,12 +52,9 @@ impl super::ItemButton for ItemMenuButton<'_> {
         ui.add_enabled_ui(self.enabled, |ui| {
             ui.spacing_mut().item_spacing = egui::Vec2::ZERO;
 
-            let mut response = egui::menu::menu_custom_button(
-                ui,
-                ui.small_icon_button_widget(self.icon),
-                self.add_contents,
-            )
-            .response;
+            let (mut response, _) =
+                SubMenuButton::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);
             }

crates/viewer/re_view_dataframe/src/view_query/ui.rs

@@ -1,5 +1,4 @@
-use std::collections::{BTreeSet, HashSet};
-
+use egui::containers::menu::SubMenuButton;
 use re_chunk_store::{ColumnDescriptor, ColumnSelector};
 use re_log_types::{
     EntityPath, ResolvedTimeRange, TimeInt, TimeType, TimeZone, Timeline, TimelineName,
@@ -8,6 +7,7 @@ use re_types::blueprint::components;
 use re_types_core::{ComponentName, ComponentNameSet};
 use re_ui::{list_item, UiExt};
 use re_viewer_context::{TimeDragValue, ViewId, ViewSystemExecutionError, ViewerContext};
+use std::collections::{BTreeSet, HashSet};
 
 use crate::view_query::Query;
 
@@ -434,7 +434,7 @@ impl Query {
 
         ui.list_item_flat_noninteractive(list_item::PropertyContent::new("Columns").value_fn(
             |ui, _| {
-                egui::menu::menu_button(ui, &visible_count_label, |ui| {
+                SubMenuButton::new(&visible_count_label).ui(ui, |ui| {
                     egui::ScrollArea::vertical()
                         .auto_shrink([false, false])
                         .show(ui, modal_ui)

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

@@ -1,13 +1,12 @@
 //! The main Rerun drop-down menu found in the top panel.
 
-use egui::containers::menu::MenuConfig;
-use egui::{NumExt as _, PopupCloseBehavior};
-
+use crate::App;
+#[cfg(debug_assertions)]
+use egui::containers::menu;
+use egui::NumExt as _;
 use re_ui::UICommand;
 use re_viewer_context::StoreContext;
 
-use crate::App;
-
 const SPACING: f32 = 12.0;
 
 impl App {
@@ -99,8 +98,11 @@ impl App {
         backend_menu_ui(&self.command_sender, ui, render_state);
 
         #[cfg(debug_assertions)]
-        egui::containers::menu::SubMenuButton::new("Debug")
-            .config(MenuConfig::new().close_behavior(PopupCloseBehavior::CloseOnClickOutside))
+        menu::SubMenuButton::new("Debug")
+            .config(
+                menu::MenuConfig::new()
+                    .close_behavior(menu::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);