From 029bfa78e1a698757f9b6483e899838a0038724a Mon Sep 17 00:00:00 2001 From: Antoine Beyeler Date: Mon, 15 Jan 2024 17:06:12 +0100 Subject: [PATCH] Updated some icons --- crates/re_data_ui/src/item_ui.rs | 2 +- crates/re_ui/data/icons/container.png | Bin 216 -> 0 bytes crates/re_ui/data/icons/container_grid.png | Bin 258 -> 297 bytes .../re_ui/data/icons/container_horizontal.png | Bin 243 -> 262 bytes crates/re_ui/data/icons/container_tabs.png | Bin 233 -> 447 bytes crates/re_ui/data/icons/container_vertical.png | Bin 231 -> 256 bytes crates/re_ui/data/icons/group.png | Bin 0 -> 381 bytes crates/re_ui/data/icons/loop.png | Bin 431 -> 424 bytes crates/re_ui/data/icons/spaceview_2d.png | Bin 425 -> 435 bytes crates/re_ui/data/icons/spaceview_3d.png | Bin 501 -> 535 bytes crates/re_ui/src/icons.rs | 2 +- crates/re_viewer/src/ui/selection_panel.rs | 2 +- crates/re_viewport/src/viewport.rs | 2 +- crates/re_viewport/src/viewport_blueprint_ui.rs | 2 +- 14 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 crates/re_ui/data/icons/container.png create mode 100644 crates/re_ui/data/icons/group.png diff --git a/crates/re_data_ui/src/item_ui.rs b/crates/re_data_ui/src/item_ui.rs index f1c3582a0999..56b0ccf106ca 100644 --- a/crates/re_data_ui/src/item_ui.rs +++ b/crates/re_data_ui/src/item_ui.rs @@ -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), ) diff --git a/crates/re_ui/data/icons/container.png b/crates/re_ui/data/icons/container.png deleted file mode 100644 index 1f7eef3faec86c5461c7bc13937e43504169be4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9E$svykh8Km+7D9BhG ze&jy5Q`dZ0`j7uMD??lUY{jCxsy|%e~M2i43U%)T>QGvx+t&!jXzQK>@UMDaIkH(m% zB#YPD+adVlkS&FOqQtOn_aq_Zl_tAT;6hU^VZs)2Mm(PyYbaz#fPi8V2XSX22cdxdexZ0F!Qmt0}I zjUYN@+t>{#!EFT5X?mGY4xA$MiX4ul#%1>E>4s_}D- iABU@z%Q#Ax!T z|KM(dappMPSrg~2g1ZU5ECC8ofC3bt00npeS2*{~=bX0+?lGqL^l**$hMAllg_84D m&$=jdo=?5zx>HQ|o7w?g*zwp;D=mir0000WT`o+@L8W@v_HSjTWF%x@ys(WP>7_reFx%N~xJ&S)6^`_KCTnBs{! TMnw)y00000NkvXXu0mjfJ1<8M diff --git a/crates/re_ui/data/icons/container_tabs.png b/crates/re_ui/data/icons/container_tabs.png index 0b68360ba3fb568b4bc2f6c32248d6f82ce5a15e..6402454ea036e9baa21bc1afadea754fc2e5aa6f 100644 GIT binary patch delta 371 zcmV-(0gV3X0lx!~Reu3gNklFS^n6UE>NI*xPArA~JVGFcHt(SHK*RM$PYe6h}z*0@`^ z^F$T0>apTsK=+YDnpr@TQP)!^uNFq(x-DJo6U7SOG?w4wI^kU3c1NxP<}g{f#A6ka z>6lA7Q6YuSF}?uPoegn+N+cN}Ou#eSbjm_f%ooz}Hn5m0nV5>Z$6VH|c@i?=zfbeA zwS=EK%r$Zub8Pz?mgw+tt04qAjBXI#+GcrvgZdGxpXqH&+9veESoLgwSc36B4Qq6U zondEqq=x)fo!b9{9`zT$`9k|`MB89)?hMk1N8I3GIJYnRm6q|u-GCiD-T`_O{|mXu R|1AIj002ovPDHLkV1gY{vx5Kt delta 156 zcmV;N0Av5Z1L*;fReu0}Nklb& z3X&i79vmcX(uR;iMO8;=k^<}wTEqZa&S_ycawI_8&6-CJc`KNl0ZMvi&3o=~ z#i)_YK`wFmS%ixQ*s=DB!>zGWRc=c(mAl3fLI@$hM!){^-W36;uz;|AhY11z0000< KMNUMnLSTX$%tEaI diff --git a/crates/re_ui/data/icons/container_vertical.png b/crates/re_ui/data/icons/container_vertical.png index 304a76afacc18dcd23afed633e3b6e12229187ff..9259d0434a11423b302042376e8490595ebae181 100644 GIT binary patch delta 178 zcmV;j08Rhr0e}LKR)3XAL_t(|0qvAg4TUfaMZ1?L1PP#kpa2V?08m0ufCdx*3Xm|I zlsniAkd>eHBsX35bAH-OlmyJ&A(rJhkjA-;f6T~+>?A{t1<+q7=m;Ib&Dza6f^J|(=>};673`@X zno`MwKosO(5)eeRa&5SAziQTD&oTl_!k)OOiE7!?_+h zq688YIVk%iFhb9fr!-N2L9#GDvc+%A7QZ!Hd{co&|9M})*Ag->g`{?C00000NkvXX Hu0mjfdf!5x diff --git a/crates/re_ui/data/icons/group.png b/crates/re_ui/data/icons/group.png new file mode 100644 index 0000000000000000000000000000000000000000..eb926c564722d1fe21ce141b2088c66748e2ee6e GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zoCO|{#S9E$svykh8Km+7D9BhG z*dTGW z%K|Nw1eUF6zW01t{d#sii|bPC8O6mcZtFMADy(;%%Hi+3Q_?N%OVir}RxEDI6^|V` za^$^a?T4?{Qxyz?oVot~KON20l^LaAleFs8H}5+?)CkvK`=#!xaK-%Rag#0n z6J{l}HwJv3a?5jrTZGsV9&dmDD>t9iCAB==DWI&g_Li}I<*X&Px_`ch{mR#R)0N7L_t(|0qvFH4T3Nbg|CMHGD1gi1e`!O5GQa1bpqW$H*f^q zKsNvP^K&LO<_{Z_XRIzw z?T3jxT#-kt!&INS79VGDP9AXGG|FX)femwL3GuC8P%|_%f>N0eEB_v1$_IaMy1`kk t%RQl}1}Ot~SJOtyp%b!dTA4pzz!luL&O>v6v;qJC002ovPDHLkV1hhsm+Sxl delta 354 zcmV-o0iFJ+1Fr*+R)0iEL_t(|0qvFDal$YVgilP~;}Wg}cMx}wq=KY_q=UGF&;g_Z z(gBkSOb5^b?m*eY=dl2p-xCkOH?yO`mTs|hYZKip-un+|M3(?Y-@ai=DS<&ICceYm z@F6f`3}V2Pkb#;N7^>7}f|KUJIPAHiGcsnd@jIh*JVN!#P~QkO^hD{9h1JwpXG=k^-? zas;N_=Ek4S6e>4sJKBSW|CqQ)w@Zd=x^tEM11o9wET2@Z#sB~S07*qoM6N<$g6)8( Ang9R* diff --git a/crates/re_ui/data/icons/spaceview_2d.png b/crates/re_ui/data/icons/spaceview_2d.png index 90b75763c95fab5a5c8af8c33901ace7c1ff1eb0..85a4d71ff0414602a35ffc1ac8084f342e277710 100644 GIT binary patch delta 358 zcmV-s0h#`(1G58=R)0uIL_t(|0qvI2QNu70MAsSqQ3<94I>70`9bhWK9gq%^RH9IU zp#stY=|Jq+7o#B-$&62b-kBZQmU2&u&(Z;^5Q3v$X&>y=(G4OM3M<)oTG|8sNuMxZ zPjp2e>2*;Q$MfpG=x@4$u^6+~*urq~pwZ>m$Rt^aGFs^W?0-`OVI<8BkCA*iV5@!4 zFc9NxB-kp^xnmp*L%kJz+c2lL>m}L-l4|ZP4x9E{5|?@fG#z8<#Z!CWT@C8SgnjEP7W#M%qzDr zRBU~jDEFyC_#N|gk0IeI{4Io|*+`Ar1v`0tWn-5A06MPw!Tw6;2mk;807*qoM6N<$ Ef>r{nMF0Q* delta 348 zcmV-i0i*u21E~X$R)0Q8L_t(|0qs`7al$YVTzU9MC8UF-1MCVy3GM_s2pyypLj@!i zKnJ)3Wlx-lM==cGg9qcC*^w>DUZ3v9w}2vq;K@1J1UqcV8XY(ld*#rOGOoxUvc+&r z$&%cWm2+;FqT7;tvV<}C&Y8YjG`vjI8vYD-f&`)(3n%Byxqp`7R@tU^89DzA14wP8 zi>RE7=`rk+uz}!Ggo>U85sT8~ zNG712plnb!aNpqrS=1ypI8S;q7~9YHVSGdat+fL8V6Ee!0SmH_h}Z^A4RU(|zrl{y z;|a{b7ThIC(hk=BfWKfyk%2XHS(`N!cNAiNPB#J@A{u4Fet$+^2Xl9hfeQUGT+3^5 z$S4K3;Mp-?kA~f_r8wZc$Wn6ehQ&%yfpsL&-c#uXu>mnf$z|au_yE4iJID5sOlq&j z-LylJq=Q96vb5v*5%lS8V$aw}dzy~(5)8n>5@o!A)wM|}Er57|UENY376}So$+$D< zoGucyGWnfMf`5Ja&JB*CEe6+?(zo-SA0+4!V}$(vyj?mc778!H5V31loR46L*oMq+ z@Of^GPYeq(2fC64FJbu3V>z}*a_p+V7#;meZs|4HTI-eEF>4`bo}@cZQsf67caY~J z*7$!uWhWmL0qk;FuX23rE$pxU;rfptsOB~=I?br8Z$wbBSz@_p6n1iODHpwR)23qU z%S3*kD}>Lq9`|GtE~9B7Z0&|?)JDfcEg>7T{12sG8Tp}-K(GJ+002ovPDHLkV1gRb B*NgxF delta 425 zcmV;a0apH(1oZ=uR)2~~L_t(|0kxLtQNu70g;yE=;}X&Vp@KLSkPa}FU@E{JKq|3Q z0ilAVgSZ3n)>#>k#)o8Y-pm^%^6`0f?GlNswF&$VmsU?da7G;&fvwS$Ft-)_3)i$< zTR4R;@Xi=>anYUOE1Z(D@Xo!wn;8jrWD@?K?j#OG7`fqbMt@(8aChEK8*b5mA_ei< za6cNd50hcIInZ5H9G=fWrbuh3fjMM`?`JKS8lG5643GSTHaY)})`Mz{tor_l+KdQ;Q}Q#|$IqS6)bOvB0Ci__*4( z`D|S4Dd-@OBf>)rd!cZ3&r;KSha}*F6x1nKzI(3aE&*5Y6Y1$Na1d|>cWTM^sMwsO zamg|vj*(4>u5F+k;O(x~JmP(nj_5}I^bcMsH TOY=-|00000NkvXXu0mjfM6JtW diff --git a/crates/re_ui/src/icons.rs b/crates/re_ui/src/icons.rs index 27c4c1437dd3..1056c2ac7a6e 100644 --- a/crates/re_ui/src/icons.rs +++ b/crates/re_ui/src/icons.rs @@ -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")); diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs index 70fa2973553f..c0b0789c1d71 100644 --- a/crates/re_viewer/src/ui/selection_panel.rs +++ b/crates/re_viewer/src/ui/selection_panel.rs @@ -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 diff --git a/crates/re_viewport/src/viewport.rs b/crates/re_viewport/src/viewport.rs index b322b9d6a24c..df14723313c7 100644 --- a/crates/re_viewport/src/viewport.rs +++ b/crates/re_viewport/src/viewport.rs @@ -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() diff --git a/crates/re_viewport/src/viewport_blueprint_ui.rs b/crates/re_viewport/src/viewport_blueprint_ui.rs index f6c9752b6afc..8734a2b0d971 100644 --- a/crates/re_viewport/src/viewport_blueprint_ui.rs +++ b/crates/re_viewport/src/viewport_blueprint_ui.rs @@ -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,