From a061683c13e1ec82c2019b7d65ab7e8c5a1b214c Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 30 Jan 2025 21:30:29 +0100 Subject: [PATCH] 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 --- Cargo.lock | 31 +++++++++---------- Cargo.toml | 4 +-- .../proto/rerun/v0/remote_store.proto | 2 +- .../re_protos/src/v0/rerun.remote_store.v0.rs | 4 +-- ...print_panel_filter_active_above_origin.png | 4 +-- ...rint_panel_filter_active_inside_origin.png | 4 +-- ...int_panel_filter_active_outside_origin.png | 4 +-- .../view_structure_test/query-path/empty.png | 4 +-- .../query-path/multiple_proj.png | 4 +-- .../query-path/non_root_origin.png | 4 +-- .../query-path/proj_with_placeholder.png | 4 +-- .../query-path/root_origin.png | 4 +-- .../query-path/single_proj.png | 4 +-- .../query-path/unknown_origin.png | 4 +-- .../view_structure_test/query-t/empty.png | 4 +-- .../query-t/multiple_proj.png | 4 +-- .../query-t/non_root_origin.png | 4 +-- .../query-t/proj_with_placeholder.png | 4 +-- .../query-t/root_origin.png | 4 +-- .../query-t/single_proj.png | 4 +-- .../query-t/unknown_origin.png | 4 +-- .../view_structure_test/query-void/empty.png | 4 +-- .../query-void/multiple_proj.png | 4 +-- .../query-void/non_root_origin.png | 4 +-- .../query-void/proj_with_placeholder.png | 4 +-- .../query-void/root_origin.png | 4 +-- .../query-void/single_proj.png | 4 +-- .../query-void/unknown_origin.png | 4 +-- crates/viewer/re_component_ui/src/color.rs | 1 + .../re_component_ui/src/marker_shape.rs | 2 +- .../AlbedoFactor_placeholder.png | 4 +-- .../Color_placeholder.png | 4 +-- .../AlbedoFactor_placeholder.png | 4 +-- .../Color_placeholder.png | 4 +-- crates/viewer/re_data_ui/Cargo.toml | 2 +- crates/viewer/re_time_panel/src/time_panel.rs | 3 +- ...time_panel_filter_test_active_no_query.png | 4 +-- .../time_panel_filter_test_active_query.png | 4 +-- .../viewer/re_ui/src/list_item/list_item.rs | 7 ++++- crates/viewer/re_ui/src/ui_ext.rs | 1 + .../re_ui/tests/snapshots/list_items.png | 4 +-- crates/viewer/re_view_graph/src/ui/draw.rs | 9 ++++-- .../re_view_spatial/src/picking_ui_pixel.rs | 22 +++++++++++-- crates/viewer/re_view_spatial/src/ui.rs | 10 ++++-- .../re_view_time_series/src/view_class.rs | 13 +++----- crates/viewer/re_viewer/src/app.rs | 3 +- crates/viewer/re_viewport/src/viewport_ui.rs | 8 ++--- 47 files changed, 137 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 918a38407239..bedc2725b69c 100644 --- 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 index 78489b7c0eb5..105198ef2aea 100644 --- 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 index fa3da37f8b51..9e0daefb7957 100644 --- 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 index ce2ff4972d88..0561e3eaf2d8 100644 --- a/crates/store/re_protos/src/v0/rerun.remote_store.v0.rs +++ b/crates/store/re_protos/src/v0/rerun.remote_store.v0.rs @@ -802,7 +802,7 @@ pub mod storage_node_client { } /// 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 @@ -996,7 +996,7 @@ pub mod storage_node_server { + 'static; /// 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/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png index ccd83e0307ae..06508ec7563b 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_above_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7357c66c618ecbdfbd1f3af3cdc6f684336e90926c99b3358b4964fd07b77090 -size 24034 +oid sha256:e68dea68a8b09cc865db85c77fe8083a25e5eef6cf659ee3ae6e4f688a8c4e54 +size 24008 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png index d4f645488e61..467fc473310e 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_inside_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36a77c9ce18d5ebc02d81159e9797df347a86156b76057bf4a54309885a72675 -size 16574 +oid sha256:f338f71e4276954f1ff62b1958ed8d9d7f1b9deb4bd75d641f4ba181ef6d2958 +size 16559 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png index 56b52bfcf0ff..8eb6bdb9d3fc 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/blueprint_panel_filter_active_outside_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4c2af6873f1d57ba79f2058a9016adb1a91a59503f004ae8e9b2ab9f5f20b7 -size 22099 +oid sha256:f8b0b3727fe273ab7c3418b9be060a5d119d1ac961124264f3f98eb0988a9686 +size 22085 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png index 1ba890fb1537..a2eec6e39020 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b601ca8a0080da7219f9765fedb28bc6429a0f4ca963bbb5ee161a080e84b1 -size 10203 +oid sha256:96fa0e86356cd65c66ca10d276f4e4b9107acc84c77d3e08e7d9e21c84c78553 +size 10178 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png index 1ba890fb1537..a2eec6e39020 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/multiple_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b601ca8a0080da7219f9765fedb28bc6429a0f4ca963bbb5ee161a080e84b1 -size 10203 +oid sha256:96fa0e86356cd65c66ca10d276f4e4b9107acc84c77d3e08e7d9e21c84c78553 +size 10178 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png index 1ba890fb1537..a2eec6e39020 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/non_root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b601ca8a0080da7219f9765fedb28bc6429a0f4ca963bbb5ee161a080e84b1 -size 10203 +oid sha256:96fa0e86356cd65c66ca10d276f4e4b9107acc84c77d3e08e7d9e21c84c78553 +size 10178 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png index c7c94cca8c4b..12d7dfd9f5df 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/proj_with_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27c98e696b61320f03b47a7f91a38e8cc0bd186dbc7661c0d2b36b4ea38f54b7 -size 21630 +oid sha256:6942a009b2eae37296c1b2f702821f60fdc2a56592792c8302932be607bc3ce8 +size 21605 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png index 39325a1624d6..53d1cecef3fe 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fc9099bc9bce0336a1f82b849009709efbe6bf682d7422377d51b4873574502 -size 21422 +oid sha256:46c158862da4e59c7fcb0b8a0d3394c8395e7442520f3cded200179d39527119 +size 21397 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png index 1ba890fb1537..a2eec6e39020 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/single_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b601ca8a0080da7219f9765fedb28bc6429a0f4ca963bbb5ee161a080e84b1 -size 10203 +oid sha256:96fa0e86356cd65c66ca10d276f4e4b9107acc84c77d3e08e7d9e21c84c78553 +size 10178 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png index 90ca003c2647..017e85423ad1 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-path/unknown_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79b5e3b2a8565ec802d43ead2f95ad46dfae013b643399860dd0a2ab63708a52 -size 16647 +oid sha256:a0007d84f93cc9d72c8bd1457f5210bcdf85d1c94df17d251381fd7d18ed8630 +size 16622 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png index 4a05b6f46985..736659550dc5 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5d221abb19b3e530beb74c287780f536e490c59dcade30b30f06a54dbf0c10e -size 9650 +oid sha256:9d68b98f8dc2dd73e97ec80b6ef15a4dc91fa385097f1308ebe3b2d2e6643f9d +size 9629 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png index e04149cb42c3..2b31c5d8bcef 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/multiple_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:235cb85c828dcb94ae3343b94ab27d5073a92ffd15dcb9ea65b15024563f58cf -size 20257 +oid sha256:f69da3ca68dec76d074b340f23a4b59202d1b18f88159c8042d65b2d7245c34c +size 20236 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png index 0c783b9bf9d0..d5bf7b9d8ead 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/non_root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28464a68f749aa952d3b67d6efe45d820b7157882b9e4c4de491fa32a772e0f5 -size 19413 +oid sha256:4323788835d7ad78174933290700713b3a4d93155dba98ec5a63a0e97f07b2f9 +size 19392 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png index 92fe911ee3df..08af9959b92f 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/proj_with_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5735ced6fd972b257cb7a3d9c65fc81495fa5c01c76af4df85c79ced033d26c9 -size 28591 +oid sha256:cc98eb0b403e88e2c3da66f5650c03264336ddd8862cfb808531be025a6fd2da +size 28569 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png index 62bd11e2412a..30167c3103df 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d51d3c378e5ef7a31dee7a05a7192b3c2a4c301f3976fcff7a896a73dcb4442f -size 23569 +oid sha256:4b728c705ef4e7254facfa548dd284334bfedb96ed9edc54f0d85e107866dcb2 +size 23548 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png index 7e4994add3aa..10dbdbcea13f 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/single_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f8ebe3a4bfa35246fbcc0ad3e624328b69b36e926637951b9193ab3e28c04b0 -size 22032 +oid sha256:7fabbcc009394a91605de8e6ba8b296c26fd854bafac0619a6d58d45424dcc44 +size 22011 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png index d3be09a32d34..1abe8273e5af 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-t/unknown_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be54ffe77e68e2e896807f5afd08bbfe75d51cffaefdaa1add891b8bcf1e56cb -size 16015 +oid sha256:fd87fd8e5ac57e28670f83b487ab9e0137528fc87d45db775ac34de85228610f +size 15994 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png index bf4a8cd4db6f..aa3485a45ec4 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65102d91a1f5f99c7eda9c17d4bedd66291788084f443e9e1d1ecdd1790ca5a6 -size 10232 +oid sha256:e7166e6d6c74f96b0efbde5c70c7195b5e9ee74fe58cb0d8c649affeb78fd838 +size 10218 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png index 6d5c8d147e6d..92d7ae22d6f5 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/multiple_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b7000931dba10b877f9333762a1efe33314f7a35e7ec2392cfae5db3d0cfc6b -size 19711 +oid sha256:61593760ce5071f1a21ef910cb99ebfe393cd855df142d9fb908aa4d6b4b47f2 +size 19697 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png index 9bcdecd6854f..c31c6b869e81 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/non_root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42d6cb895d0c28c778155c0b7c99366e30ad6cba0c2b1567ff952da6f6709a41 -size 17939 +oid sha256:12a8ebf201cb8663b586f275f9dcae65d0ad6f75c9221fbc3dd00131c192c149 +size 17924 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png index 9bcdecd6854f..c31c6b869e81 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/proj_with_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42d6cb895d0c28c778155c0b7c99366e30ad6cba0c2b1567ff952da6f6709a41 -size 17939 +oid sha256:12a8ebf201cb8663b586f275f9dcae65d0ad6f75c9221fbc3dd00131c192c149 +size 17924 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png index 10a359268b6a..bfce90576bc4 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/root_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c74ec0d271594999ac2f1c86b960176bb62cd8f8cdb2920450e24d035eba0cec -size 19523 +oid sha256:3ec13de625a247184bac90d3a7b7dd01f01b9aef0b8db5941d6b443926296262 +size 19509 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png index dae559723ae3..0fc6e4b874af 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/single_proj.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a64ddb5afa41613ce6741c854c6fbd7d2af489eeb7eb5bdeae43a347e24bd79b -size 20557 +oid sha256:aade1f9fc0c47d5bef0c5409fe5a50daa3114642d0999de0a10faa2e4bbb1ff3 +size 20543 diff --git a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png index bf4a8cd4db6f..aa3485a45ec4 100644 --- a/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png +++ b/crates/viewer/re_blueprint_tree/tests/snapshots/view_structure_test/query-void/unknown_origin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65102d91a1f5f99c7eda9c17d4bedd66291788084f443e9e1d1ecdd1790ca5a6 -size 10232 +oid sha256:e7166e6d6c74f96b0efbde5c70c7195b5e9ee74fe58cb0d8c649affeb78fd838 +size 10218 diff --git a/crates/viewer/re_component_ui/src/color.rs b/crates/viewer/re_component_ui/src/color.rs index 48392540adf1..1c20019690fb 100644 --- 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 index 955f0ff2fe4e..5afe9f24cb4d 100644 --- 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/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png index 516a5f3acfe8..9cce9b85e2a5 100644 --- a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png +++ b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/AlbedoFactor_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcbc3d328bca52a715731be693802a9ee39f474355e754561aa605edb4180c09 -size 2827 +oid sha256:62d5f1cd652f1a002826fd9107414d98ecafb24e811665bdef4a0635a78fa870 +size 2810 diff --git a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png index 516a5f3acfe8..9cce9b85e2a5 100644 --- a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png +++ b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_narrow/Color_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcbc3d328bca52a715731be693802a9ee39f474355e754561aa605edb4180c09 -size 2827 +oid sha256:62d5f1cd652f1a002826fd9107414d98ecafb24e811665bdef4a0635a78fa870 +size 2810 diff --git a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png index 0321ea816c06..f163fd07ec3a 100644 --- a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png +++ b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/AlbedoFactor_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:687df70f81563566512069ab2182cad07911ea40e2a3aeeea33130054f31688a -size 3137 +oid sha256:009d520e149af50337726eb17e0ce2cb36c67c719de59b98544fbe951eeb9081 +size 3121 diff --git a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png index 0321ea816c06..f163fd07ec3a 100644 --- a/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png +++ b/crates/viewer/re_component_ui/tests/snapshots/all_components_list_item_wide/Color_placeholder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:687df70f81563566512069ab2182cad07911ea40e2a3aeeea33130054f31688a -size 3137 +oid sha256:009d520e149af50337726eb17e0ce2cb36c67c719de59b98544fbe951eeb9081 +size 3121 diff --git a/crates/viewer/re_data_ui/Cargo.toml b/crates/viewer/re_data_ui/Cargo.toml index 0ffb3549fc3c..53ce049ac4ee 100644 --- 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 index c5f8658187e8..9c122010af43 100644 --- 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/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png b/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png index 7e2d91fc12c6..1ba1cbf54cd4 100644 --- a/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png +++ b/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_no_query.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d44fe5a5f525ac01203f631b6d75023323f384fc3d7fde4d2ff8f1a72264f072 -size 17468 +oid sha256:c61e81a1d776ef4dd6e75a68eb0f73157945129dd3eaf0d3a113fcb4bf54aa48 +size 17401 diff --git a/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png b/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png index 7a1ce0daf8ca..21b2eaacb6f6 100644 --- a/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png +++ b/crates/viewer/re_time_panel/tests/snapshots/time_panel_filter_test_active_query.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7de7ddd6c3b874dd17ae124dd89b2ba396360fb8e9ad96102ec3571c56da158d -size 21810 +oid sha256:f7333f18ac80478e3e0b14474325d73b6e900c0866a5fae525f50112d9f8b317 +size 21812 diff --git a/crates/viewer/re_ui/src/list_item/list_item.rs b/crates/viewer/re_ui/src/list_item/list_item.rs index 051c7c33cbe2..4b1ccf2a531b 100644 --- a/crates/viewer/re_ui/src/list_item/list_item.rs +++ b/crates/viewer/re_ui/src/list_item/list_item.rs @@ -412,7 +412,12 @@ impl ListItem { let stroke = crate::design_tokens().drop_target_container_stroke(); ui.painter().set( background_frame, - Shape::rect_stroke(bg_rect_to_paint.shrink(stroke.width), 0.0, stroke), + Shape::rect_stroke( + bg_rect_to_paint.shrink(stroke.width), + 0.0, + stroke, + egui::StrokeKind::Inside, + ), ); } diff --git a/crates/viewer/re_ui/src/ui_ext.rs b/crates/viewer/re_ui/src/ui_ext.rs index 9448b5e764ed..2e33562cab4b 100644 --- a/crates/viewer/re_ui/src/ui_ext.rs +++ b/crates/viewer/re_ui/src/ui_ext.rs @@ -765,6 +765,7 @@ pub trait UiExt { visuals.rounding, visuals.weak_bg_fill, visuals.bg_stroke, + egui::StrokeKind::Inside, ); } diff --git a/crates/viewer/re_ui/tests/snapshots/list_items.png b/crates/viewer/re_ui/tests/snapshots/list_items.png index a77e07f76e98..de1e8952e5e2 100644 --- a/crates/viewer/re_ui/tests/snapshots/list_items.png +++ b/crates/viewer/re_ui/tests/snapshots/list_items.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:086ea1d934e76962279b3d5b57fa0afdb626587ff4b302597d70ca7e2626df38 -size 89533 +oid sha256:d1581d1da7c118c4200a022a5ded2410c8f77c781c67e8bef8e54b20a6eb4dd1 +size 89428 diff --git a/crates/viewer/re_view_graph/src/ui/draw.rs b/crates/viewer/re_view_graph/src/ui/draw.rs index c6f2940a363d..89f175157650 100644 --- a/crates/viewer/re_view_graph/src/ui/draw.rs +++ b/crates/viewer/re_view_graph/src/ui/draw.rs @@ -305,8 +305,13 @@ pub fn draw_entity_rect( let padded = rect.expand(10.0); - ui.painter() - .rect(padded, 0.0, Color32::TRANSPARENT, Stroke::new(1.0, color)); + ui.painter().rect( + padded, + 0.0, + Color32::TRANSPARENT, + Stroke::new(1.0, color), + egui::StrokeKind::Inside, + ); ui.painter().text( padded.left_top(), diff --git a/crates/viewer/re_view_spatial/src/picking_ui_pixel.rs b/crates/viewer/re_view_spatial/src/picking_ui_pixel.rs index 033d7d654509..04544b272915 100644 --- a/crates/viewer/re_view_spatial/src/picking_ui_pixel.rs +++ b/crates/viewer/re_view_spatial/src/picking_ui_pixel.rs @@ -125,8 +125,18 @@ fn show_zoomed_image_region_area_outline( let sample_rect = Rect::from_min_max(pos2(left, top), pos2(right, bottom)); // TODO(emilk): use `parent_ui.painter()` and put it in a high Z layer, when https://github.com/emilk/egui/issues/1516 is done let painter = egui_ctx.debug_painter().with_clip_rect(ui_clip_rect); - painter.rect_stroke(sample_rect, 0.0, (2.0, egui::Color32::BLACK)); - painter.rect_stroke(sample_rect, 0.0, (1.0, egui::Color32::WHITE)); + painter.rect_stroke( + sample_rect, + 0.0, + (2.0, egui::Color32::BLACK), + egui::StrokeKind::Middle, + ); + painter.rect_stroke( + sample_rect, + 0.0, + (1.0, egui::Color32::WHITE), + egui::StrokeKind::Middle, + ); } /// Identifies an image/texture interaction. @@ -230,8 +240,14 @@ fn try_show_zoomed_image_region( center_texel_rect.expand(1.0), 0.0, (1.0, egui::Color32::BLACK), + egui::StrokeKind::Outside, + ); + painter.rect_stroke( + center_texel_rect, + 0.0, + (1.0, egui::Color32::WHITE), + egui::StrokeKind::Outside, ); - painter.rect_stroke(center_texel_rect, 0.0, (1.0, egui::Color32::WHITE)); } let [x, y] = center_texel; diff --git a/crates/viewer/re_view_spatial/src/ui.rs b/crates/viewer/re_view_spatial/src/ui.rs index bf282ef7322b..5a3bc3e81964 100644 --- a/crates/viewer/re_view_spatial/src/ui.rs +++ b/crates/viewer/re_view_spatial/src/ui.rs @@ -269,8 +269,14 @@ pub fn create_labels( }; label_shapes.push( - egui::epaint::RectShape::new(bg_rect.expand(4.0), 4.0, background_color, rect_stroke) - .into(), + egui::epaint::RectShape::new( + bg_rect.expand(4.0), + 4.0, + background_color, + rect_stroke, + egui::StrokeKind::Outside, + ) + .into(), ); label_shapes.push(egui::Shape::galley( text_rect.center_top(), diff --git a/crates/viewer/re_view_time_series/src/view_class.rs b/crates/viewer/re_view_time_series/src/view_class.rs index 0809a12f18e9..9b3b5d6bf2c2 100644 --- a/crates/viewer/re_view_time_series/src/view_class.rs +++ b/crates/viewer/re_view_time_series/src/view_class.rs @@ -369,7 +369,7 @@ Display time series data in a plot. let time_zone_for_timestamps = ctx.app_options.time_zone; let mut plot = Plot::new(plot_id_src) .id(crate::plot_id(query.view_id)) - .auto_bounds([true, false].into()) // Never use y auto bounds: we dictated bounds via blueprint under all circumstances. + .auto_bounds([true, false]) // Never use y auto bounds: we dictated bounds via blueprint under all circumstances. .allow_zoom([true, !lock_y_during_zoom]) .x_axis_formatter(move |time, _| { format_time( @@ -436,13 +436,10 @@ Display time series data in a plot. )); let current_auto = plot_ui.auto_bounds(); - plot_ui.set_auto_bounds( - [ - current_auto[0] || is_resetting, - is_resetting && !y_zoom_lock, - ] - .into(), - ); + plot_ui.set_auto_bounds([ + current_auto[0] || is_resetting, + is_resetting && !y_zoom_lock, + ]); *state.scalar_range.start_mut() = f64::INFINITY; *state.scalar_range.end_mut() = f64::NEG_INFINITY; diff --git a/crates/viewer/re_viewer/src/app.rs b/crates/viewer/re_viewer/src/app.rs index e8b8013ae8f8..34f36d519752 100644 --- a/crates/viewer/re_viewer/src/app.rs +++ b/crates/viewer/re_viewer/src/app.rs @@ -2070,9 +2070,10 @@ fn paint_native_window_frame(egui_ctx: &egui::Context) { ); painter.rect_stroke( - egui_ctx.screen_rect().shrink(0.5), + egui_ctx.screen_rect(), re_ui::DesignTokens::native_window_rounding(), re_ui::design_tokens().native_frame_stroke, + egui::StrokeKind::Inside, ); } diff --git a/crates/viewer/re_viewport/src/viewport_ui.rs b/crates/viewer/re_viewport/src/viewport_ui.rs index 13294947ff33..969def3bafde 100644 --- a/crates/viewer/re_viewport/src/viewport_ui.rs +++ b/crates/viewer/re_viewport/src/viewport_ui.rs @@ -166,10 +166,9 @@ impl ViewportUi { egui::LayerId::new(ui.layer_id().order, ui.id().with("child_id")); ui.ctx().set_sublayer(ui.layer_id(), top_layer_id); // Make sure it is directly on top of the ui layer - // We need to shrink a bit so the panel-resize lines don't cover the highlight rectangle. - // This is hacky. + // We paint the stroke on the inside so the panel-resize lines don't cover the highlight rectangle. let painter = ui.painter().clone().with_layer_id(top_layer_id); - painter.rect_stroke(rect.shrink(stroke.width), 0.0, stroke); + painter.rect_stroke(rect, 0.0, stroke, egui::StrokeKind::Inside); if should_display_drop_destination_frame { painter.rect_filled( @@ -820,8 +819,7 @@ impl TabWidget { } fn paint(self, ui: &egui::Ui) { - ui.painter() - .rect(self.rect, 0.0, self.bg_color, egui::Stroke::NONE); + ui.painter().rect_filled(self.rect, 0.0, self.bg_color); let icon_image = self .icon