Update to latest egui (#8865)

## Changes * When painting a rect stroke, you must chose if the stroke is inside, outside, or on the rectangle. * TextEdit and ColorButton have been shrunk to fit inside their widget rects ## TODO * [x] Check that the choices of `StrokeKind` makes sense everywhere
rerun-io · Jan 30, 2025 · a061683 · a061683
1 parent ec2adb6
commit a061683
Show file tree

Hide file tree

Showing 47 changed files with 137 additions and 109 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1957,7 +1957,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 [[package]]
 name = "ecolor"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "bytemuck",
  "color-hex",
@@ -1974,7 +1974,7 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
 [[package]]
 name = "eframe"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2013,7 +2013,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "accesskit",
  "ahash",
@@ -2031,7 +2031,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2050,7 +2050,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "accesskit_winit",
  "ahash",
@@ -2070,7 +2070,7 @@ dependencies = [
 [[package]]
 name = "egui_commonmark"
 version = "0.19.0"
-source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#d08ab5704b9cf6bd4234757c43b49e86c7f053c4"
+source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#9d500ac65fea8273f8d26eb6f513dded86778389"
 dependencies = [
  "egui",
  "egui_commonmark_backend",
@@ -2081,7 +2081,7 @@ dependencies = [
 [[package]]
 name = "egui_commonmark_backend"
 version = "0.19.0"
-source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#d08ab5704b9cf6bd4234757c43b49e86c7f053c4"
+source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#9d500ac65fea8273f8d26eb6f513dded86778389"
 dependencies = [
  "egui",
  "egui_extras",
@@ -2091,7 +2091,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "ahash",
  "egui",
@@ -2108,7 +2108,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "egui_kittest"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "dify",
  "eframe",
@@ -2140,7 +2140,7 @@ dependencies = [
 [[package]]
 name = "egui_plot"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui_plot.git?rev=80e2199a2e121db288fe6b0099d91c35acc75a7c#80e2199a2e121db288fe6b0099d91c35acc75a7c"
+source = "git+https://github.com/emilk/egui_plot.git?branch=main#a19562ea60a13b276a1e96035c5600fb4932ce53"
 dependencies = [
  "ahash",
  "egui",
@@ -2161,8 +2161,7 @@ dependencies = [
 [[package]]
 name = "egui_tiles"
 version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588dcf9028464fb4d23baf1f7805c13927fb540f2f9096f7d177b814848645a3"
+source = "git+https://github.com/rerun-io/egui_tiles?branch=emilk/update-egui#4876446fd618c59571490c7a637043d569f2e531"
 dependencies = [
  "ahash",
  "egui",
@@ -2196,7 +2195,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "emath"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2312,7 +2311,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -2331,7 +2330,7 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
+source = "git+https://github.com/emilk/egui.git?branch=master#8eda32ec64c7b48c7b8f9195e3abc8c10efa8f00"
 
 [[package]]
 name = "equivalent"

diff --git a/Cargo.toml b/Cargo.toml
@@ -590,10 +590,10 @@ emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
 # egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
 # emath = { path = "../../egui/crates/emath" }
 
-egui_plot = { git = "https://github.com/emilk/egui_plot.git", rev = "80e2199a2e121db288fe6b0099d91c35acc75a7c" }
+egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "main" }
 # egui_plot = { path = "../../egui_plot/egui_plot" }
 
-# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "48e0ef566479000a23d8dabf84badced98f1b9a6" } # https://github.com/rerun-io/egui_tiles/pull/89 2024-11-19
+egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" }
 #egui_tiles = { path = "../egui_tiles" }
 
 egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", branch = "egui-update" } # https://github.com/lampsitter/egui_commonmark/pull/71

diff --git a/crates/store/re_protos/proto/rerun/v0/remote_store.proto b/crates/store/re_protos/proto/rerun/v0/remote_store.proto
@@ -12,7 +12,7 @@ service StorageNode {
     rpc CreateCollectionIndex(CreateCollectionIndexRequest) returns (CreateCollectionIndexResponse) {}
     // Collection index query response is a RecordBatch with 3 columns:
     // - 'resource_id' column with the id of the resource
-    // - timepoint column with the values reprensenting the points in time
+    // - timepoint column with the values representing the points in time
     // where index query matches. What time points are matched depends on the type of
     // index that is queried. For example for vector search it might be timepoints where
     // top-K matches are found within *each* resource in the collection. For inverted index

diff --git a/crates/store/re_protos/src/v0/rerun.remote_store.v0.rs b/crates/store/re_protos/src/v0/rerun.remote_store.v0.rs
diff --git a/...e_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png b/...e_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png
diff --git a/..._blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png b/..._blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png
diff --git a/...blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png b/...blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png
diff --git a/...ewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png b/...ewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png
diff --git a/...blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png b/...blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png
diff --git a/...ueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png b/...ueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png
diff --git a/...t_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png b/...t_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png
diff --git a/...e_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png b/...e_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png
diff --git a/...e_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png b/...e_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png
diff --git a/...lueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png b/...lueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png
diff --git a/.../viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png b/.../viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png
diff --git a/...re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png b/...re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png
diff --git a/..._blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png b/..._blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png
diff --git a/...rint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png b/...rint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png
diff --git a/...r/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png b/...r/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png
diff --git a/...r/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png b/...r/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png
diff --git a/...e_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png b/...e_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png
diff --git a/...ewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png b/...ewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png
diff --git a/...blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png b/...blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png
diff --git a/...ueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png b/...ueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png
diff --git a/...t_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png b/...t_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png
diff --git a/...e_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png b/...e_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png
diff --git a/...e_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png b/...e_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png
diff --git a/...lueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png b/...lueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png
diff --git a/crates/viewer/re_component_ui/src/color.rs b/crates/viewer/re_component_ui/src/color.rs
@@ -35,6 +35,7 @@ fn edit_rgba32_impl(ui: &mut egui::Ui, color: &mut MaybeMutRef<'_, Rgba32>) -> e
         response.rect,
         1.0,
         ui.visuals().widgets.noninteractive.fg_stroke,
+        egui::StrokeKind::Inside,
     );
 
     let [r, g, b, a] = color.to_array();

diff --git a/crates/viewer/re_component_ui/src/marker_shape.rs b/crates/viewer/re_component_ui/src/marker_shape.rs
@@ -81,7 +81,7 @@ pub(crate) fn paint_marker(
         .filled(true);
 
     let bounds = egui_plot::PlotBounds::new_symmetrical(0.5);
-    let transform = egui_plot::PlotTransform::new(rect, bounds, [true, true].into());
+    let transform = egui_plot::PlotTransform::new(rect, bounds, true);
 
     let mut shapes = vec![];
     points.shapes(ui, &transform, &mut shapes);

diff --git a/...ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png b/...ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png
diff --git a/...ponent_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png b/...ponent_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png
diff --git a/...t_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png b/...t_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png
diff --git a/...omponent_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png b/...omponent_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png
diff --git a/crates/viewer/re_data_ui/Cargo.toml b/crates/viewer/re_data_ui/Cargo.toml
@@ -33,7 +33,7 @@ re_types = { workspace = true, features = [
   "egui_plot", # Needed to draw marker shapes.
 ] }
 re_types_core.workspace = true
-re_ui.workspace = true
+re_ui = { workspace = true, features = ["arrow"] }
 re_video = { workspace = true, features = ["ffmpeg"] }
 re_viewer_context.workspace = true
 

diff --git a/crates/viewer/re_time_panel/src/time_panel.rs b/crates/viewer/re_time_panel/src/time_panel.rs
@@ -1311,11 +1311,10 @@ fn paint_range_highlight(
         let visible_history_area_rect =
             Rect::from_x_y_ranges(x_from..=x_to, rect.y_range()).intersect(rect);
 
-        painter.rect(
+        painter.rect_filled(
             visible_history_area_rect,
             0.0,
             egui::Color32::WHITE.gamma_multiply(0.1),
-            egui::Stroke::NONE,
         );
     }
 }

diff --git a/...viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png b/...viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png
diff --git a/...es/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png b/...es/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png