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.

Sign up for GitHub

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

Jump to bottom

use forward/backwards icon in selection panel #1128

Merged
merged 1 commit into from
Feb 7, 2023
Merged

use forward/backwards icon in selection panel #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion crates/re_viewer/src/misc/selection_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,11 @@ impl SelectionState {

pub fn selection_ui(
&mut self,
re_ui: &re_ui::ReUi,
ui: &mut egui::Ui,
blueprint: &mut Blueprint,
) -> Option<ItemCollection> {
self.history.selection_ui(ui, blueprint)
self.history.selection_ui(re_ui, ui, blueprint)
}

pub fn highlight_for_ui_element(&self, test: &Item) -> HoverHighlight {
Expand Down
51 changes: 32 additions & 19 deletions crates/re_viewer/src/ui/selection_history_ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ use crate::{misc::ItemCollection, ui::Blueprint, Item};
impl SelectionHistory {
pub(crate) fn selection_ui(
&mut self,
re_ui: &re_ui::ReUi,
ui: &mut egui::Ui,
blueprint: &Blueprint,
) -> Option<ItemCollection> {
self.control_bar_ui(ui, blueprint).map(|sel| sel.selection)
self.control_bar_ui(re_ui, ui, blueprint)
.map(|sel| sel.selection)
}

fn control_bar_ui(
&mut self,
re_ui: &re_ui::ReUi,
ui: &mut egui::Ui,
blueprint: &Blueprint,
) -> Option<HistoricalSelection> {
Expand All @@ -28,8 +31,8 @@ impl SelectionHistory {
ui.available_size_before_wrap(),
egui::Layout::right_to_left(egui::Align::Center),
|ui| {
let next = self.next_button_ui(ui, blueprint);
let prev = self.prev_button_ui(ui, blueprint);
let next = self.next_button_ui(re_ui, ui, blueprint);
let prev = self.prev_button_ui(re_ui, ui, blueprint);
prev.or(next)
}).inner
}).inner
Expand Down Expand Up @@ -63,20 +66,22 @@ impl SelectionHistory {

fn prev_button_ui(
&mut self,
re_ui: &re_ui::ReUi,
ui: &mut egui::Ui,
blueprint: &Blueprint,
) -> Option<HistoricalSelection> {
// undo selection
let button = egui::Button::new("⬅");
if let Some(previous) = self.previous() {
let response = ui.add(button).on_hover_text(format!(
"Go to previous selection{}:\n\
let response = re_ui
.small_icon_button(ui, &re_ui::icons::ARROW_LEFT)
.on_hover_text(format!(
"Go to previous selection{}:\n\
{}\n\
\n\
Right-click for more.",
Command::SelectionPrevious.format_shortcut_tooltip_suffix(ui.ctx()),
item_collection_to_string(blueprint, &previous.selection),
));
Command::SelectionPrevious.format_shortcut_tooltip_suffix(ui.ctx()),
item_collection_to_string(blueprint, &previous.selection),
));

let response = response.context_menu(|ui| {
// undo: newest on top, oldest on bottom
Expand All @@ -92,29 +97,34 @@ impl SelectionHistory {
return self.select_previous();
}
} else {
ui.add_enabled(false, button)
.on_disabled_hover_text("No past selections found");
ui.add_enabled_ui(false, |ui| {
re_ui
.small_icon_button(ui, &re_ui::icons::ARROW_LEFT)
.on_disabled_hover_text("No past selections found");
});
}

None
}

fn next_button_ui(
&mut self,
re_ui: &re_ui::ReUi,
ui: &mut egui::Ui,
blueprint: &Blueprint,
) -> Option<HistoricalSelection> {
// redo selection
let button = egui::Button::new("➡");
if let Some(next) = self.next() {
let response = ui.add(button).on_hover_text(format!(
"Go to next selection{}:\n\
let response = re_ui
.small_icon_button(ui, &re_ui::icons::ARROW_RIGHT)
.on_hover_text(format!(
"Go to next selection{}:\n\
{}\n\
\n\
Right-click for more.",
Command::SelectionNext.format_shortcut_tooltip_suffix(ui.ctx()),
item_collection_to_string(blueprint, &next.selection),
));
Command::SelectionNext.format_shortcut_tooltip_suffix(ui.ctx()),
item_collection_to_string(blueprint, &next.selection),
));

let response = response.context_menu(|ui| {
// redo: oldest on top, most recent on bottom
Expand All @@ -130,8 +140,11 @@ impl SelectionHistory {
return self.select_next();
}
} else {
ui.add_enabled(false, button)
.on_disabled_hover_text("No future selections found");
ui.add_enabled_ui(false, |ui| {
re_ui
.small_icon_button(ui, &re_ui::icons::ARROW_RIGHT)
.on_disabled_hover_text("No future selections found");
});
}

None
Expand Down
6 changes: 4 additions & 2 deletions crates/re_viewer/src/ui/selection_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ impl SelectionPanel {
..Default::default()
})
.show_inside(ui, |ui| {
if let Some(selection) =
ctx.rec_cfg.selection_state.selection_ui(ui, blueprint)
if let Some(selection) = ctx
.rec_cfg
.selection_state
.selection_ui(ctx.re_ui, ui, blueprint)
{
ctx.set_multi_selection(selection.iter().cloned());
}
Expand Down