From 13bcc3a464909e5d0426ca5b7ed997fac8afe9a6 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Wed, 27 Nov 2024 21:20:20 -0800 Subject: [PATCH] =?UTF-8?q?ui:=20Don=E2=80=99t=20override=20label=20gravit?= =?UTF-8?q?y=20for=20text-only=20buttons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are at least two bugs/design flaws still here, but at least this helps with text-only buttons working as expected. --- all-is-cubes-ui/src/vui/widgets/button.rs | 7 +++++-- .../expected/ui/widget_button_action-2-all.png | Bin 488 -> 486 bytes .../expected/ui/widget_button_toggle-2-all.png | Bin 423 -> 421 bytes .../expected/ui/widget_button_toggle-all.png | Bin 424 -> 421 bytes 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/all-is-cubes-ui/src/vui/widgets/button.rs b/all-is-cubes-ui/src/vui/widgets/button.rs index a3d98108e..8f309ddbe 100644 --- a/all-is-cubes-ui/src/vui/widgets/button.rs +++ b/all-is-cubes-ui/src/vui/widgets/button.rs @@ -63,8 +63,11 @@ impl ButtonLabel { /// Always has as many elements as `requirements().minimum`. fn blocks(&self, mut gravity: vui::Gravity) -> impl Iterator + '_ { // TODO: need a better plan for how gravity interacts with icons; - // this is a kludge to get okay layout of the text for now - gravity.x = vui::Align::Low; + // this is a kludge to get okay layout of the text for now, by left-aligning the + // text to meet the icon. + if self.icon.is_some() { + gravity.x = vui::Align::Low; + } self.icon .clone() diff --git a/test-renderers/expected/ui/widget_button_action-2-all.png b/test-renderers/expected/ui/widget_button_action-2-all.png index 5d4fc4b461169dbfc604b4df869311712caca2de..61ed2ffad53148aa8228e98b083a7f397fdcaceb 100644 GIT binary patch delta 430 zcmaFC{ET^mO8r_-7srr_TW{|=3OO5yFa(I7KC4@-%tF5rCim!t;hw^; z{JX+?OdAbeupctmA?>ViM=R8Z!O8M0TMLu%)H*M{bPm=7s}4HO&{;fl7c0oy6DLU7 zu9Z8)%vjIxP;jPsDuw<& z{xEl$^pQyC!y}-v6{!_?TVy4uXkJ>F%!LmYup{&9F9n=e*KH1Bj}_3++;r1Bb*(&POmo<>aun4 zyIOQ#XkuIx&=SY7RYIXmp-SP2K^)`7--YF~>W+OX_V=(gUopj?%6UtiOMi<6Gs_|& zrTFQK6}HuPF)1;B+?}xZ`}wC~tR2ThFFwA zzu50;SNSTK{B_7^t~O*jv^wZ8vqI11Hx3d8#xK*K6tx;K(c0s@r}AYPfWXt$&t;uc GLK6To%&v0) diff --git a/test-renderers/expected/ui/widget_button_toggle-2-all.png b/test-renderers/expected/ui/widget_button_toggle-2-all.png index 0b6a716071d81bcafccc866e5263269aaf6855c2..316292f8bbdca61117c2e87ba8c1b542b3c6bc27 100644 GIT binary patch delta 342 zcmZ3^yp(x@N^Xv)i(^Q|t+#i5`I;33*aGyA{e6EyHvI!bN$O?!EjKv)-YC!XHNE@G z>B_3qvn$HtPL~VcV7$1QW8wt4`a?hNFTZFzB}r(}9p~&PDPL5+oJVL#7VMPXY+fePlke;@{4w d@Rv6q^Sw4QPVxK6xR?P5JYD@<);T3K0RZ?4j{yJx delta 348 zcmZ3=yqtN0N=}}qi(^Q|t+#g_`I-y_STDq_`M#go`rHA=SBEArFgY$Monn4+jbg2c z?`QQTA`99UPD#{IeST-l@z-jm?Gn37Vz0)<^)qk?C^$4QFfy@#89$6W_N~9AVD{=n z<%L_3SBf0Zn>F^zUfjhwaiUzk)7|fxCHzYxS~R{Fr0P69<+{RlohYZ$a~b|cU;o5t zbQ~@`I(15nZby{n{xE^1@A=nfTXcxGtS(+JEurvDA**$QBgi5b(~i~u-!1zhb$Y(u zHGQW&zYYGX969cw;80=OXu)pi9C?$stR-9+>>LiRjo+Q?tU26e&dqX=gF5pNv%--~ zmNP1UUG$aCugJT z`Vh|g6Pr{dUf;U4Yg?Gt%&6O?;*SNBR=<8K6m|Z(G6NF}hk$}Z0|O(NagH@Gn^#w$ zSzxbJr17h{=AZ7e@Hx1MO`IrSFY*7k$*%TmK2FoBC3@$anb-27Y^{&L(kV3pn}0tK za_n&vt=8PB(XnF6eVvY|*B|yQYp!tnQTFVsC|ieY#|j1`ur(dcKfc|+8`$yo#_sb* z4l=bf{J1x=voN)U3wJPd#O<}>2eQBlJvcUgcdpao@RqqY3+y^+pgRvSD;&vWIivE| zMen^LOT*HGjv3Pox8yZW4rG*c0;xJA(Y`_P0lz}d#F;FImTg4%3v9#@b%D*lo>#># b-7jbU(Q?uDyR$21F#v(5tDnm{r-UW|vuBF= delta 349 zcmZ3=yn=axN^ZWVi(^Q|t+#g_`I-y_STDq_F)zQ#T_MI7AbyNRkVk24^B&JM-j|Cr zX4xw)WiaL0%ICb+^7*>IJMx0g3-s@c)AOyavSm_mXkcJuV&M<~Gal_%@Y3{^KH{|2 zl7E(U_bj~^*VHy_P_8ncI8nZS#b>+TcMHS11)j=%>sk6{C&$|3Ta_H2%z5niW!`*l z){SPXET&J&X1%EO^g8#VDVwTd4?Fq@eml2EFR`J5`Jz?>57?Spj&J^!n=ic{@vmZI zAIHa+hf6#<@*5o*K4dX%6im8Py!&7ukO_8@qvE~46Xx?B5^UeBCZHe-c4^B829820 zMq^L=iKh))7&e$#a2z%|^+Ig2AETr**n%s2YXl5l^nK_&qaa`>#SQlxgpt$u!qnc} dJoMM=U5v&tGgpLvWthtV1fH&bF6*2UngH_Uh?oEX