Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit the size of component tooltips with UiVerbosity::Reduced #3171

Merged
merged 7 commits into from
Sep 1, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions crates/re_data_ui/src/component.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use egui::NumExt;
use re_data_store::{EntityPath, InstancePath};
use re_query::ComponentWithInstances;
use re_types::ComponentName;
Expand Down Expand Up @@ -44,6 +45,37 @@ impl DataUi for EntityComponentWithInstances {
UiVerbosity::Reduced | UiVerbosity::All => false,
};

// in some cases, we don't want to display all instances
let max_row = match verbosity {
UiVerbosity::Small => 0,
UiVerbosity::Reduced => num_instances.at_most(4), // includes "…x more" if any
UiVerbosity::All => num_instances,
};

// Here we enforce that exactly `max_row` rows are displayed, which means that:
// - For `num_instances == max_row`, then `max_row` rows are displayed.
// - For `num_instances == max_row + 1`, then `max_row-1` rows are displayed and "…2 more"
// is appended.
//
// ┏━━━┳━━━┳━━━┳━━━┓
// ┃ 3 ┃ 4 ┃ 5 ┃ 6 ┃ <- num_instances
// ┗━━━┻━━━┻━━━┻━━━┛
// ┌───┬───┬───┬───┐ ┐
// │ x │ x │ x │ x │ │
// ├───┼───┼───┼───┤ │
// │ x │ x │ x │ x │ │
// ├───┼───┼───┼───┤ ├─ max_row == 4
// │ x │ x │ x │ x │ │
// ├───┼───┼───┼───┤ │
// │ │ x │…+2│…+3│ │
// └───┴───┴───┴───┘ ┘
let displayed_row = if num_instances <= max_row {
num_instances
} else {
// this accounts for the "…x more" using a row and handles `num_instances == 0`
max_row.saturating_sub(1)
};

if num_instances == 0 {
ui.weak("(empty)");
} else if num_instances == 1 {
Expand All @@ -69,7 +101,7 @@ impl DataUi for EntityComponentWithInstances {
egui_extras::TableBuilder::new(ui)
.resizable(false)
.vscroll(true)
.auto_shrink([false, true])
.auto_shrink([true, true])
.max_scroll_height(100.0)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.columns(egui_extras::Column::auto(), 2)
Expand All @@ -85,7 +117,7 @@ impl DataUi for EntityComponentWithInstances {
.body(|mut body| {
re_ui::ReUi::setup_table_body(&mut body);
let row_height = re_ui::ReUi::table_line_height();
body.rows(row_height, num_instances, |index, mut row| {
body.rows(row_height, displayed_row, |index, mut row| {
if let Some(instance_key) = instance_keys.get(index) {
row.col(|ui| {
let instance_path =
Expand All @@ -112,6 +144,12 @@ impl DataUi for EntityComponentWithInstances {
}
});
});
if num_instances > displayed_row {
ui.label(format!(
"…and {} more.",
re_format::format_large_number((num_instances - displayed_row) as _)
));
}
Comment on lines +147 to +152
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if num_instances > displayed_row {
ui.label(format!(
"…and {} more.",
re_format::format_large_number((num_instances - displayed_row) as _)
));
}
if num_rows_to_show < num_instances {
ui.label(format!(
"…and {} more.",
re_format::format_large_number((num_instances - num_rows_to_show) as _)
));
}

}
}
}