Skip to content

Commit

Permalink
More review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
abey79 committed Dec 11, 2024
1 parent 5242225 commit b6753cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions crates/viewer/re_viewer_context/src/drag_and_drop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,15 @@ fn items_to_string<'a>(items: impl Iterator<Item = &'a Item>) -> String {
count_and_names
.into_iter()
.filter_map(|(count, name_singular, name_plural)| {
if cnt > 0 {
if count > 0 {
Some(format!(
"{} {}",
cnt,
if cnt == 1 { name.0 } else { name.1 },
re_format::format_uint(count),
if count == 1 {
name_singular
} else {
name_plural
},
))
} else {
None
Expand Down
4 changes: 2 additions & 2 deletions crates/viewer/re_viewer_context/src/viewer_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ impl ViewerContext<'_> {
selection_state.set_selection(selected_items.clone());
}

let selection_contains_undraggable_items = self
let selection_may_be_dragged = self
.undraggable_items
.iter_items()
.all(|item| !selected_items.contains_item(item));

let payload = if selection_contains_undraggable_items {
let payload = if selection_may_be_dragged {
DragAndDropPayload::from_items(&selected_items)
} else {
DragAndDropPayload::Invalid
Expand Down

0 comments on commit b6753cd

Please sign in to comment.