From 7eac4638022d9fcb825d44f4319baf11b2cb356a Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 13 Sep 2024 14:27:29 +0200 Subject: [PATCH] Update egui and egui_table --- Cargo.lock | 26 +++++++++---------- Cargo.toml | 14 +++++----- .../viewer/re_space_view_dataframe/Cargo.toml | 2 +- .../src/dataframe_ui.rs | 5 +++- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6c988aa1c40..bce11d2cb0b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1777,7 +1777,7 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecolor" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "bytemuck", "emath", @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "ahash", "bytemuck", @@ -1824,7 +1824,7 @@ dependencies = [ [[package]] name = "egui" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "accesskit", "ahash", @@ -1841,7 +1841,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "ahash", "bytemuck", @@ -1860,7 +1860,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "accesskit_winit", "ahash", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "egui_commonmark" version = "0.17.0" -source = "git+https://github.com/rerun-io/egui_commonmark?rev=5997e897df5b2aceab9df833ee4bb293d05d9b07#5997e897df5b2aceab9df833ee4bb293d05d9b07" +source = "git+https://github.com/rerun-io/egui_commonmark?rev=7a9dc755bfa351a3796274cb8ca87129b051c084#7a9dc755bfa351a3796274cb8ca87129b051c084" dependencies = [ "egui", "egui_commonmark_backend", @@ -1890,7 +1890,7 @@ dependencies = [ [[package]] name = "egui_commonmark_backend" version = "0.17.0" -source = "git+https://github.com/rerun-io/egui_commonmark?rev=5997e897df5b2aceab9df833ee4bb293d05d9b07#5997e897df5b2aceab9df833ee4bb293d05d9b07" +source = "git+https://github.com/rerun-io/egui_commonmark?rev=7a9dc755bfa351a3796274cb8ca87129b051c084#7a9dc755bfa351a3796274cb8ca87129b051c084" dependencies = [ "egui", "egui_extras", @@ -1900,7 +1900,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "ahash", "egui", @@ -1916,7 +1916,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "ahash", "bytemuck", @@ -1945,7 +1945,7 @@ dependencies = [ [[package]] name = "egui_table" version = "0.28.1" -source = "git+https://github.com/rerun-io/egui_table.git?rev=0f594701d528c4a9553521cb941de1886549dc70#0f594701d528c4a9553521cb941de1886549dc70" +source = "git+https://github.com/rerun-io/egui_table.git?rev=c76473b244f03a7c67fbbbff9def6fc86c1ca4ea#c76473b244f03a7c67fbbbff9def6fc86c1ca4ea" dependencies = [ "egui", "serde", @@ -1989,7 +1989,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "bytemuck", "serde", @@ -2090,7 +2090,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" dependencies = [ "ab_glyph", "ahash", @@ -2109,7 +2109,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed#b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" +source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" [[package]] name = "equivalent" diff --git a/Cargo.toml b/Cargo.toml index 99e43cd3c629..66e2f4e619a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -514,12 +514,12 @@ missing_errors_doc = "allow" # As a last resport, patch with a commit to our own repository. # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk. -ecolor = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 -eframe = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 -egui = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 -egui_extras = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 -emath = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31e0c26c40ac8249d8b2ed" } # egui master 2024-09-06 +ecolor = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +eframe = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +egui = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +egui_extras = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +emath = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 # Useful while developing: # ecolor = { path = "../../egui/crates/ecolor" } @@ -535,7 +535,7 @@ emath = { git = "https://github.com/emilk/egui.git", rev = "b01a7b1ee82181fb8c31 egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "b2f5e232524deed983bcad01c05f27d0e8b89d98" } # https://github.com/rerun-io/egui_tiles/pull/78 2024-08-28 # egui_tiles = { path = "../egui_tiles" } -egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "5997e897df5b2aceab9df833ee4bb293d05d9b07" } # https://github.com/lampsitter/egui_commonmark/pull/65 +egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "7a9dc755bfa351a3796274cb8ca87129b051c084" } # https://github.com/lampsitter/egui_commonmark/pull/65 # commit on `rerun-io/mp4` `main` branch # https://github.com/rerun-io/mp4/commit/ef529032547d7f97161e95c58bd76856cb116349 diff --git a/crates/viewer/re_space_view_dataframe/Cargo.toml b/crates/viewer/re_space_view_dataframe/Cargo.toml index a92540e3bb41..9394d9ebcaa7 100644 --- a/crates/viewer/re_space_view_dataframe/Cargo.toml +++ b/crates/viewer/re_space_view_dataframe/Cargo.toml @@ -36,7 +36,7 @@ re_viewport_blueprint.workspace = true anyhow.workspace = true egui_extras.workspace = true -egui_table = { git = "https://github.com/rerun-io/egui_table.git", rev = "0f594701d528c4a9553521cb941de1886549dc70" } # main as of 2024-09-09 +egui_table = { git = "https://github.com/rerun-io/egui_table.git", rev = "c76473b244f03a7c67fbbbff9def6fc86c1ca4ea" } # main as of 2024-09-13 egui.workspace = true itertools.workspace = true thiserror.workspace = true diff --git a/crates/viewer/re_space_view_dataframe/src/dataframe_ui.rs b/crates/viewer/re_space_view_dataframe/src/dataframe_ui.rs index 0ded69c81d30..245fd91cbd27 100644 --- a/crates/viewer/re_space_view_dataframe/src/dataframe_ui.rs +++ b/crates/viewer/re_space_view_dataframe/src/dataframe_ui.rs @@ -173,6 +173,10 @@ impl DataframeTableDelegate<'_> { } impl<'a> egui_table::TableDelegate for DataframeTableDelegate<'a> { + fn default_row_height(&self) -> f32 { + re_ui::DesignTokens::table_line_height() + } + fn prepare(&mut self, info: &egui_table::PrefetchInfo) { re_tracing::profile_function!(); @@ -337,7 +341,6 @@ fn dataframe_ui_impl(ctx: &ViewerContext<'_>, ui: &mut egui::Ui, query_handle: & egui_table::HeaderRow::new(re_ui::DesignTokens::table_header_height()), ]) .num_rows(num_rows) - .row_height(re_ui::DesignTokens::table_line_height()) .show(ui, &mut table_delegate); }); }