From fe0c5ef010ea9c4ee9b5c8424a6848c4a704254a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?= Date: Tue, 21 Apr 2026 13:19:58 +0200 Subject: [PATCH] Updated samples --- .../CommandBarLabelPositionPage.xaml | 22 ++++++++++++++---- .../Controls/CommandBar.xaml | 20 ++++++++++++++++ .../Controls/CommandBar.xaml | 20 ++++++++++++++++ ...erflow_ShowsLabel_WhenCompact.expected.png | Bin 1797 -> 1805 bytes 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml index a1dbea2db1..e0ab585f40 100644 --- a/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml +++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml @@ -6,6 +6,8 @@ M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19C20.92,17.39 19.61,16.08 18,16.08Z M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z + M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20M16,11V18.1L13.9,16L11.1,18.8L8.3,16L11.1,13.2L9,11.1L16,11Z + M19.43,12.98C19.47,12.66 19.5,12.34 19.5,12C19.5,11.66 19.47,11.33 19.42,11L21.54,9.34C21.73,9.19 21.78,8.92 21.66,8.7L19.66,5.24C19.54,5.02 19.29,4.93 19.06,5.02L16.56,6.03C16.04,5.63 15.5,5.3 14.87,5.05L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.05C8.5,5.3 7.96,5.64 7.44,6.03L4.94,5.02C4.71,4.93 4.46,5.02 4.34,5.24L2.34,8.7C2.21,8.92 2.27,9.19 2.46,9.34L4.58,11C4.53,11.33 4.5,11.66 4.5,12C4.5,12.34 4.53,12.66 4.57,12.98L2.45,14.64C2.26,14.79 2.21,15.06 2.33,15.28L4.33,18.74C4.45,18.96 4.7,19.05 4.93,18.96L7.43,17.95C7.95,18.35 8.5,18.68 9.12,18.93L9.49,21.56C9.54,21.8 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.95C15.5,18.7 16.04,18.36 16.56,17.97L19.06,18.98C19.29,19.07 19.54,18.98 19.66,18.76L21.66,15.3C21.78,15.08 21.73,14.81 21.54,14.66L19.43,12.98M12,15.5A3.5,3.5 0 1,1 12,8A3.5,3.5 0 0,1 12,15.5Z @@ -14,33 +16,45 @@ - + + + + + - + + + + + - - + + + + + + diff --git a/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml b/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml index 97e9c172c3..c7bc85e993 100644 --- a/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml +++ b/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml @@ -104,10 +104,20 @@ + @@ -195,10 +205,20 @@ + diff --git a/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml b/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml index 6542abca75..f2e3399c2b 100644 --- a/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml +++ b/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml @@ -98,10 +98,20 @@ + @@ -190,10 +200,20 @@ + diff --git a/tests/TestFiles/Skia/Controls/CommandBar/AppBarButton_Overflow_ShowsLabel_WhenCompact.expected.png b/tests/TestFiles/Skia/Controls/CommandBar/AppBarButton_Overflow_ShowsLabel_WhenCompact.expected.png index ae07c2b4a890fdca1715a690e4ed9d6c7850c6af..b856a952caf5cab7d842ef079e1605e309b15e93 100644 GIT binary patch delta 1773 zcma))`#;l*AIGQYtK%}Eoy2L;j?}Pq&dv^NBX@HczV1^lBTdO=BDWqNL@sUSJLXcY zi6cE8OgY1_a{2PLLy0xZy*Lmb#9o_uPg=5x8vGKU4mv?^!8fu(jX9qn?d_uxM zvnG?Zh)7~JkmXNFpd=LP-hSeZ@jCa(H{P&qVOlU{y-l6t?#gGrUP7&f2^zB=jy_T-+e$DBVs=zzM0W*_))y4`FqoK^o+zV>?M*nEgU#UDEE#Sw^I_@s~ z`JYpF&(Tl1@~IgQm$u|1|8Hj57bcbyqo>-k5kzN}y`5cmqt({d7VZ7ZQdDY~zfGCr zJR_zKKp+rnTXH{$`k{j?#K0)Z)Rexm5)G;IMV6PBZyt|{ic$xFZz`{n65G>uZ9P1+ zl$4b2T9r)ypjJOrYJQ2;t)7&Xysy|=+)CMPI{ymdSATK$@)}Ux+*~p|>`kFiMqA@g zOQll2Vsc@S8+rXYr-AqQv8X`?V%B2o&U+nw=FAy?o-Y^$!sGG$ zO<{L(atMm~xw+WCdh!Aol93Uov^4z9l}ST9{y{;3W+U0G*6(S_o;nmdySmDBtXkjs zD6REd-`qS!ApF2~`BA`RFd9;~qse44WQdA+;(Zp3oBGuf-T6d+wE<5nv6U2awM?lwYRr~I zDsbW!7Z(TQ=oOY8!*MjhEitvY`^&5dN{f#l6U4y#`uZl@Z|OsFx^1GP%|Qy@K0cw? z`)5o{Ak*S1r||G_0FA@tk45!HVK-$1`mrh~B=T-ci^a;j7s$bxSrO9!pH$e`h|$*8 zb|#TzQ^K1NI-MT-ar9gP+?wR-svZ{?HyVY7Sf%Y;xO(+$1iyTFLf{n;U@3b42RcyA z{OHWg3>dMH!_la}+&heRUtVZV-i&Z@agkvPf}Wm60VrrupM6Axab#p$@3x=a=U zG62h&)l+{-=BR4uPJ)hsc4q zJY5)UV{^gXKvVQ!P{-|bK21|E5weXrV`>Oos$>+&B7q3k$E>hn} zBt&=j8Zi3xiRJ;hqC-blH;c=Kx7dCxDK54LeT<9pwpZVWHIe6=b8}Vi-Mcs15cV$> z6&3K-X8n`OC{s&Q*vm$@(4e3bzP0RU&(M&ir6v3U26Fn*qelQg$O)>hjz*)?#nf;b zjrI9+VhJi(GrceTuU>|}fmK@B^mGUghr^c;kiK;lwYAsAf0??a*xNgN_;9&s>YHD1 zFnoW1AAEvODTIuS3|iooE2j+&4GnNNRMSOF_{-lgT|$__BAu@Onrpqf{t!Xz;B}_F zco*ijcb-512y+Vy5~(zsRC5Z8^{vlrXlTG-vD$Drw6iTi-jcX{yuH00f-p9wH26Ea zx+08>GVgwm%Di^FoWpUW(S8Cgi%Uwh_4J5#b_acYe9{!3^1w4iVfAZBoDGZ28}Zz9 z2)&?yRbJi)VhRu@nz7mJI&xEf>h?+~9~kp*j?(Mu>H=d7D%!JK*OzV|-G+bRisGX| zJhWf9tGAElbZ0P`P%NtgVEy=;3=bF7 z)tQ>Y)Wl-31&8#Vnpz&6-V=pAh_z)bu@TPk6gxwC|sX=ZDn;j~c0LJ)Npb!TK z2Yl-1S5<>xM|5-hU$j6nJd9bb$@)24>Q*a#eeA|X`Bd=r-skJX;*pWk?@>W$D=QKR zdXQ_qFxOW^6Owtb(68_{m+Y@KZEZLv!{|a_;C(^PuHT2{<@uTJoV2~q3=Ms(mY!ao znEFK`QFQQ4n01dIMp(|`Zu+*dk$(A%cO9LT-c*|%uby9hl^u>`z;qpy$sW2#s5YMV e6)OL5FdyS>ZF6wo-vcucu!s&M`+D1u%)bFht7a_# delta 1765 zcmai#`8(Tb7sgWzUe)v+MJ-jM)Kb#Xw6%?;sBKCpX-1>3ZHPp*HFi zc-gZKRQooU7BLeOj!sfA>^W^~sdw=H6-qw#%xbO9C4ZNKv$>t+=GT~Py{%^896R~&n}kt-?(L!9se}xf+*}iHsWZRbm`wUWEHUv+W%Cr z@Q2jztYtp|?;~&Kb?m_+T?6;@C?dX$H{Ki&iXwgql~lo2u?9ZY{d8OQ8=KqJ4Gk27 zs+TVjr7>%hZN}BEMNUfDKx0l;7SKsJtqRdEbkt6VbK9v@eL9^Ep>kIJFqq@N_?elR z^Xuzh&s^HsIX;R>NJx;Bl-ykw$|O@&_E*N60}DH%eJ<{Drd@ZeT+Q-eA{B}y!!sU zj*bp{HNsKz3)HoSi;A|q>)HV`vQIvfxw!c&h%^uSpHDS zD=9BmJ3KmKE{AzGbOg_d#Kpxuud1qGVn;Ta%-bywr+y3#y$UfYg=W}_cCy(D5OZ^L zEDaEp4h%T-_VqEBfiP((^gX*x&c?D~tb(=72&C=q?pFVtn3$*_oq`jj-DE>!7l#zB ztgSoBij^==!ug}wxw+iyS{E<+qYF-ir}^kBfS(G6G1rGE7J#OqAz9^zh^&&5A=>>h zNO0S|Pm7DLckbBu`(H%W`Z;o8*m%F67ltQ#RA@bA4|i+M*y6^KeegEwX^eSLkw+U~hv$i}|lzN?#C zBf36lvNbzBJ^k)}9$?mWT$e&1xVgGoMMN01k`>*$O~cFjCTRCTl?ylVwiVg!?WTJ2 zCkqRKLU2f9&^R1YR8+*^3$7U&R%lCkv;?WCsm0IEdJhf`8sWca1BaUuii(OnK~7Fi zYI?fw()-epk&&n=-S578!s7*kbAS8D938dA;dJDQ$xTi0hg0--Mc41Q0$B^{RM&-WO47lKj?tb|6=)*+nqa@@NKn1BuMT%hoWl3JMCH3n5Gv zEAg$j%hLJ;jYy}PgoK7hZ_Xz(iXDAKSHnznE?-8eMuvwEw_e#k$C)z+$YnLU2!DfO z<6q{*`Z86xgZa9%o*Y{{yWFxe1Rig)u&@xsruv{}NOmqR{{{J)g*Mu`y2_ZDnYru9 zdv@THryl;)cj3YXY*3IN>o+G^Sy`96clX=^59B0YeWH#Bu?&)LHD zqKkSlJO7TjyT31zRZx&Rj8VUGB|9}$5v5;ZU|ASN#EibntF=cfTK3W-8( z?W}qzDJcaTojYe7(!;N2c87|H=)>Vw7>p*xJl1z_YXONwQvC*G9!|HXbcPzrz6)U=eT{O7id~~f4}_@X8Rsl0BD5~jweR0223u!|JB{IJ*tta+yTu0!DHm? lCYceQ#yS5};Q#wYa5inX6wQnHb_N1I2OGrAmsZ{he*?o;jyC`R