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

Update container (and a couple other) icons #4814

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/re_data_ui/src/item_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ pub fn data_blueprint_group_button_to(
.re_ui
.selectable_label_with_icon(
ui,
&re_ui::icons::CONTAINER,
&re_ui::icons::GROUP,
text,
ctx.selection().contains_item(&item),
)
Expand Down
Binary file removed crates/re_ui/data/icons/container.png
Binary file not shown.
Binary file modified crates/re_ui/data/icons/container_grid.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/container_horizontal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/container_tabs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/container_vertical.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added crates/re_ui/data/icons/group.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/loop.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/spaceview_2d.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/re_ui/data/icons/spaceview_3d.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion crates/re_ui/src/icons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ pub const SPACE_VIEW_UNKNOWN: Icon = Icon::new(
include_bytes!("../data/icons/spaceview_unknown.png"),
);

pub const CONTAINER: Icon = Icon::new("container", include_bytes!("../data/icons/container.png"));
pub const GROUP: Icon = Icon::new("group", include_bytes!("../data/icons/group.png"));

pub const STORE: Icon = Icon::new("store", include_bytes!("../data/icons/store.png"));

Expand Down
2 changes: 1 addition & 1 deletion crates/re_viewer/src/ui/selection_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ fn what_is_selected_ui(
ctx.re_ui,
ui,
&entity_path.to_string(),
Some(&re_ui::icons::CONTAINER),
Some(&re_ui::icons::GROUP),
&format!(
"Group {:?} as shown in Space View {:?}",
entity_path, space_view.display_name
Expand Down
2 changes: 1 addition & 1 deletion crates/re_viewport/src/viewport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ impl TabWidget {
// tab icon
let icon_size = ReUi::small_icon_size();
let icon_width_plus_padding = icon_size.x + ReUi::text_to_icon_padding();
let icon = space_view.map_or(&re_ui::icons::CONTAINER, |space_view| {
let icon = space_view.map_or(&re_ui::icons::SPACE_VIEW_GENERIC, |space_view| {
space_view
.class(tab_viewer.ctx.space_view_class_registry)
.icon()
Expand Down
2 changes: 1 addition & 1 deletion crates/re_viewport/src/viewport_blueprint_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ impl Viewport<'_, '_> {
.selected(is_selected)
.subdued(!properties.visible || !group_is_visible)
.force_hovered(is_item_hovered)
.with_icon(&re_ui::icons::CONTAINER)
.with_icon(&re_ui::icons::GROUP)
.with_buttons(|re_ui, ui| {
let vis_response = visibility_button_ui(
re_ui,
Expand Down