From 7434058296353f2acf412dea650ba9f80e245b27 Mon Sep 17 00:00:00 2001 From: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Date: Fri, 12 Dec 2025 18:56:45 +0530 Subject: [PATCH 1/5] fix added --- src/Controls/src/Core/TitleBar/TitleBar.cs | 4 ++ .../TestCases.HostApp/Issues/Issue33136.cs | 49 +++++++++++++++++++ .../Tests/Issues/Issue33136.cs | 20 ++++++++ 3 files changed, 73 insertions(+) create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs diff --git a/src/Controls/src/Core/TitleBar/TitleBar.cs b/src/Controls/src/Core/TitleBar/TitleBar.cs index 37eb60c04266..f635ebdcf993 100644 --- a/src/Controls/src/Core/TitleBar/TitleBar.cs +++ b/src/Controls/src/Core/TitleBar/TitleBar.cs @@ -348,7 +348,11 @@ static View BuildDefaultTemplate() var contentGrid = new Grid() { #if MACCATALYST +#if MACCATALYST26_0_OR_GREATER + Margin = new Thickness(90, 0, 0, 0), +#else Margin = new Thickness(80, 0, 0, 0), +#endif #endif HorizontalOptions = LayoutOptions.Fill, ColumnDefinitions = diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs new file mode 100644 index 000000000000..0c2a4cdaad39 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs @@ -0,0 +1,49 @@ +using System.Collections.ObjectModel; + +namespace Maui.Controls.Sample.Issues; + +[Issue(IssueTracker.Github, 33136, "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version", PlatformAffected.macOS)] + +public class Issue33136 : ContentPage +{ + public Issue33136() + { + // Create TitleBar + var titleBar = new TitleBar + { + Title = "Maui App", + Subtitle = "Hello, World!", + ForegroundColor = Colors.Red, + HeightRequest = 48 + }; + + titleBar.LeadingContent = new Image {Source = "dotnet_bot.png", HeightRequest = 24}; + + // Set the TitleBar on the current Window when this page appears + this.Loaded += (sender, e) => + { + if (Window != null) + { + Window.TitleBar = titleBar; + } + }; + + // Create the page content with a Label + Content = new VerticalStackLayout + { + Spacing = 25, + Padding = new Thickness(30), + VerticalOptions = LayoutOptions.Center, + Children = + { + new Label + { + Text = "TitleBar should be aligned properly", + AutomationId = "TitleBarAlignmentLabel", + FontSize = 32, + HorizontalOptions = LayoutOptions.Center + }, + } + }; + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs new file mode 100644 index 000000000000..9ac0c7622657 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs @@ -0,0 +1,20 @@ +#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_IOS // TitleBar is only applicable for Windows and macOS +using NUnit.Framework; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues; + public class Issue31539 : _IssuesUITest + { + public Issue31539(TestDevice device) : base(device) { } + + public override string Issue => "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version"; + [Test] + [Category(UITestCategories.Window)] + public void VerifyBackButtonTitleUpdates() + { + App.WaitForElement("TitleBarAlignmentLabel"); + VerifyScreenshot(includeTitleBar: true); + } + } +#endif \ No newline at end of file From 74fe389888564b5cb238bb1c2feabf6861c9b9d3 Mon Sep 17 00:00:00 2001 From: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Date: Fri, 12 Dec 2025 19:07:45 +0530 Subject: [PATCH 2/5] Update Issue33136.cs --- .../tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs index 9ac0c7622657..7544cab1b60a 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs @@ -4,9 +4,9 @@ using UITest.Core; namespace Microsoft.Maui.TestCases.Tests.Issues; - public class Issue31539 : _IssuesUITest + public class Issue33136 : _IssuesUITest { - public Issue31539(TestDevice device) : base(device) { } + public Issue33136(TestDevice device) : base(device) { } public override string Issue => "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version"; [Test] From a39b7dc9bb65b905a5485a1f744b03a6c2fc4132 Mon Sep 17 00:00:00 2001 From: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:07:13 +0530 Subject: [PATCH 3/5] snapshot added --- .../snapshots/mac/VerifyTitleBarAlignment.png | Bin 0 -> 23377 bytes .../Tests/Issues/Issue33136.cs | 2 +- .../windows/VerifyTitleBarAlignment.png | Bin 0 -> 12893 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTitleBarAlignment.png create mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTitleBarAlignment.png diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTitleBarAlignment.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTitleBarAlignment.png new file mode 100644 index 0000000000000000000000000000000000000000..3fb91f7f0d40155cb91131a59a44d034c200c400 GIT binary patch literal 23377 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 "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version"; [Test] [Category(UITestCategories.Window)] - public void VerifyBackButtonTitleUpdates() + public void VerifyTitleBarAlignment() { App.WaitForElement("TitleBarAlignmentLabel"); VerifyScreenshot(includeTitleBar: true); diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTitleBarAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTitleBarAlignment.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c6bf3bcc9378f3327efa410e97ed3787cbdb47 GIT binary patch literal 12893 zcmZvCXFyX~w{{ejaipj?0@7@VD1wTDhyh0hEFeP%sfvICNd$xdfkYh(O0$AeM-h-v zA~p1&RO!-NK)RF!X$dXKJ!c>0d%5p-|0E|T$=Q3Y^{lnmexCjGud6zOzwi1Tg+d8l zx_H45h2on*q1G?{wjR0@^*KNcdRymVsB;dLRxddQec0gir{13^RC?%^mFpW(sN?*X zF8pciZNs2%`7G<{ue8+a;;p&qvACar!118pHf$T(ruLh+vYbKMo8#Ax9iMK=Zi$ju zuSyN6___Zt(;FtA_a0D7Y6-p0Rkzx?u#689DR)F#5&Y&Dw$m7i$YyYV+PElP|vMo+xSpti8s(F z)JHk^(tQbj^)*Q>@M3g1LS|q5G;T~6lu$WwKF*JwKw7Nj&4%~!DoL2f>rnU5x|H_F zRFSLnWGb3FbpOdDzAEGI4?QiA4+$^H-BMB$`^q%)=99X4qiEq?&aW%BJ`1V5K|)_K zmno-$o6wt&kVip}Isb=g>b30K%?SxNv?*qN%fT{!gZZS>ze@OoPTlO|6Y6HC^Ha;q zx?{X&OhzfE2c7h-GAI(5btpT1x0cQ+>1~awbXFTPMAU`rNFgy&$6_Y9vVGQ59T%L3ZhVjKgWHK zwoTz1i{-e>W`&a<9S)l+q32}zrQB-YE1~-XTAgTqV&F%>>QG-;R;r{oFX$)n3eMv&3OGEnRR3a^5sTF%w4rn7Q9A<2!7jqh#s% zQ;paEI(CVsugOCvM*H`FTb9fnY8>WopO&@jBd4i1Xk-_?^ZgQ{mXL|HHo`^|m~*te z<$2p!oBE3;t&63auGI}xb}`jssz^`GZ)Gr=$L))pxfh8YPqC#LU01v@un=IXP)Ite z!PMt|lyBIZARd#F8Wb8Zj6&%~^>G<}y%`QyhC0?6h{r`dwK*HRSnJfw%ApGGUlt3h z7Hbt~=zGb0`NfRl<35=PGsWqMLHem3&O^eoNoiftr%aGBrvbENMsaP`sL zxo8r;FN|L3#`?NNox~m0Q@fz%yt8~%v(JaOoG3!#wLfmTdOFEtG+Iy1eZ^<=~_HLv!Ou-K-9yNZ#=GNNx?j_*cK6ZQgj; zGHt%pK}X7~Nx~+5prh1grrLo`WboTA&K=R`bSu|IZTYo@*0|U+8sWac>5EO1-y33P zGCS2y^3NaHV(Xnox@yTS)s+1HO3sRa8671R&xYX7u(RLmihI0qsMua%qL?;6p^o#Z znWI@OeS-pDcVZeBC35v`@kJSIev-$~iv~gM+|V-HtSz?-n#&R^N44wDCjJ8<<=u9a zU3#ibQT|xI#(wRSB8>U2o3w-Ph}zlv+S;QNi7T~i8ixYm&cBm<-ZXZ4rqxMme(q(W zIzK)HZ9lwuRE99q)tb06H_j*2$##%aAaT_7yL%(A<;*myb6LF$2O1Tw7vG>sd(?Vt zUgnc|n-uM~G!~tY5fwU!UuR|=*p z5{?hdPuOZoB@Nns{Ke(6Qv>Lcs;bQ^mAqV|#6_Z9>>2+T8a@8(y9qdc`}AXCH!9v1 zDah^YAO;3({*a*gMW-zkcif>`$v-J+1Im1VACJq9?43A&!&rG+V5%h}VBV5AR~9Y7 zTyC@N$(|x!F^$d6$oy#IIrFTNiuKQ#ol9<)UVdg|lX0_;Da`a;=(Qv*h>XhMOTH|p zs<{jcGyN9QC_TJJ|IpX63Ku^1S2gzwbL~z)Vp~$v@&Yt$+pXKJ=0m48G1?z*wcw4C zi21*Y*?K$$j)%6X;#pU%&DGOWg|iXW7kguuj9<;i^{_sSiKZ`)64T_vf1!_a!m%pH z4kc(#myK?+Pv16Oqk!=W-B@uG<8!vQiRj}!VHtVOytojmw!hA}Ecd>4VIAuTGXK1N zA~A=JU7=8WJ(`8XidLQ*5gqHs+ofCSiN3#LWqisHhuXLe&8Qc<^E5GjKc29$N$T@2 zD5qSPmAexYe6O%9+<(5{r@7W`;4O=V%V;=%m;6Y*?>m=d0@X6y(=W_$ zalBOdP>-*hqiG9)36kG=Rr?}mK8xs2y7nws=`X#VzGCaV=}JauXP~*=*gNH`>JHtT z<(x;jC3>iP#?pkz^n@0to5Ne|7Nk41F0nkH&f~ds|3vQG_<393M(z{oI}0^JMGVT+ z7`nCdZe=Oul;`l%QE5WcVsfbZ;HP*U>6Nm5`Wn-}n(-?Pf9T?Ft!Iz8j^=y|%U<7B zE%Vc(rJ}xxlxwYX4{vk6D(Uib$m2bJ9!4HZW6eJP;dFNmcHStnK=4@mgl(Un>MbW8 zR8ZI-BlcorXO0nUa_ueE;+Bd%;&B!&#PPIX`7axI}UHT@c z&vWIs56dalHx60Oz0>K?px4>AnIC1hozsTnv}HKdL_~Tm!;9Df-*rW!=&7-WImp^$ zWO18&9Uq~_h5pNySInMl*;XmZZ8}*algrVuU7l5E^^tg~q3CH6=L@fs?o^4+j;Tv2F)Tgt|c!fOTa?5-R4V{B=CQyQ$ISVi3sG3Fo-EEi}8{);2 zt&5dPeds>*YwtwD$Je3WhRR+EJA+4a@2eB<4yaW|%~TAAN&Eb0tJ7o(Xt8YQJ~K}f z*_~8EMT0b{{t<;Z=2nw~@h6K@pAh<%weRMLTWm(5Hlsx+WC(XAwkc`O{U{ao8~C2c zLfgfj50hyO>gcbs7bYxyb4rLwCEcA0BU`4P?w1v&7f1-F@}p2YOIuo4%%+4Mi>0RX zInWwnDeXHDU~+{t&_~f2OPGvz z)lYe-I~1+>&SRpRg>!pOh(NvPy`a5qQ**yvftu6keCAWQ{j{F%Ig$x=soM0$9ncS= z#`Bq2Of_`la#2h%{DW9?VH7HF%o2JXGkKE?-|Cq=lBu^1g{rFdfE(I8GT90;^xotd zsx%7qa$ z$otQ*K2m=`ZE?FG80|KB)YBLmJ_`2B?jqUK{m?YMOxof3KewWo5o#2mACH2Mkznq< ztRx0Kn_|%^unr2Li3zn}>>rWHJ#cT%mftP%d*yunzqOn$bwp`jR5Iz%pDLpdsIBeALrBl$G zwF!90epSx?sCa&<7T71^t)A>!dw4ril}ZQ%e$6J2WBq^StZqDVftktby~nqpP~Td! z;qZNHMT3}5JWhb7Ff;@l-aBXM7`Yc3<`qEgcCfdx1bZ7_?7NK+I`+2W+td8@l%bs7 zZ;T&jJ{F{&JP+@WKpcJlvjM^aTV9<7jy%)=poM@5Oq2plewmyP9P9pKyd0iBX6e$Y zE5KYsx*H4xU}vhHIOL=xX5KYu-km=1eO(mda$wPzo+h;y%s&F$C3@<|B$^53;^4<{`8%9cwKDxtC`G4DUQ*k%1s}JOup8y(mc@j%r47zDs)y9fs~hfYYW4&v9lB zjNF^8MLwl1k4&j_N&%75Z?q}01J0yzWT5q=f-W0z*E4c!LLLU#JOjn)d|%! z3w!h;C5;Xvs}t0hPER!aRYtPWXviE zR=4>k;2}2n+eXkhKIVZMsf$8> zfuJ=l5ug|IZ9DjP-rvH#W&qdu)<}ivj%@|CIyr&T4uRucYj(TAI*5AkL|~RjoXMu!6x(_L*@Cg+c~HKSfFp~p z!4p~ekB8>|&r2vcz^(2v$if5s4d8|~N!$**L>0EAWIsTMYBZc2n)>jHvw1fFJw09z zs&7@_Ks8!_m#PAl$KCPOAlI!KVHVJLX=yIN8@?dmSQC>xxY#v$z#%}a%*zLJrjE(= zpMV*iBcSdjAA;Z9lTSx8t3h6X+#NE70rJ0Me`w8wuqFu4Ll=RTJeU?b=Sd&Kc6@%n z>bz^P%c|;t%fOPW9QU>!G+ zz5{hLodBkr0Z39=rw_r-cxF!XVswHOdydo%ld>fYTtBPGgxSZDNO1>srTea26e#^C zS|9L3qN_aa?!{jYI)b-{HdyMU6Vztb#Prc^n_SA>5i_0 zY7pY3tAO}|eJ=-MOa)vT5@Rf|1W+Xbbk?ph*>e356Sd)I znl-`82wIZd$FaEtOXSK+x~B(jh8~hH!?V3u4^U%c-A;c)QAIA;0*u$a2labNmTpF9&7;Uyb>fs)$*Kj0!# z`aoHl0i_tJX*bPQ%Mqh18&vvROP_ScOP~Bgum-T3gaaSyu z%n%DYI9s(Z^mT-&dE}u@l5S<&CfZUxoNwxHrAf&$E2pj)Z7dlOnYga%Hy0-p9IM)M zr_>rxH*scdwajtNV|BSSs81DMQOx_8^g#5|idWgx#U0gCTTl&wm*pgX-mO;~jS3Z% zk84Y@Xck~w04u0LD zq%d!0;}d`7V`1(9bstgZ!(T*Ol($BUCneLlmAp&Lka%ft$cfTfW5>{kbOCnWbcKYI zxVjSK!-qy=#+`{&s-k61N)Wx!$HSPy0+FDf;uF32{*|{CD81OVcnkS?_`8i<& zN;k_F0VK0h|IF}_%+Gg9^~a@r=QKRT$b}GuV%_9BfKAAR)0|8ItB$d-39;C&}qwb``gHAzL z10U|le7kL5khHAh)7v+ykJl*1wu>{A3)Kvi)9BSF2E8u(nZC1Q2}|u1Y@!Jj^wg?7 zi{75xMY>pI8?Z=2n1>grZ^KM!y@j}TbR*?nnwwK z)ss&gbY)USpXj_JD(e3ooX*j)uPyjd(BEAeClDqZ9;dj>D!Di_DQ;!qkyr$P0a^ z($)4!$aNLI^K}|b5FT_C$D=Bl*lwo~YV!t&NFMhqO1n zXuA{eboNHn^K(g|B9`I;ZcFmb7xID_nlhq{+Zy!~ZZnF?6^jacuO@|lacmMlcFIa- zqA^D5NkfX3#q7ds^MyI59&dX;s{*xBk2gzicem{)hTYlf5v<;x({=J`!y%a+1DON+ zHf3Dlovv(Hc%8Gc%W*SCIj1W<9cyOoY4T3CY<+jhF~4f1`O<=a0y=9p7~CQ|W*t`h zt1otJxxJ8%XLL9|wtfmRqv@XMf9%o7S5VH1l$_5zQ6(Ar!QwR|_{|iqgS!cr(ET3$ zFrr`TvO^H&F+QL?%wV7DXH3?8`VNuTOC2R|j~#Fk9(;S;xw=El)v;sGfx~f2PGg!g z{2B-6aFf3j7`wC`luOgHVoi#D%YRh)pI``IVesrp`l2CR z-&G9Wa&Cz)2p)N}=fEwpS6lrlcZV*Fc*mA48cjPJV;B^DF(0eo6^?Vak2n2X=lK2L z2Sv@*vx$_p!1<%+)LzsQb8a;>*4>FU)I5GNXY~91bXoV{Gdho1LtP{TGVk>nh5DrF zZTlJ?4Q7QGZ+iJ>k^tX)f$_+$P9eT7<)tc>&{Q$CoDNq@A;aSzm;SM-MiSmnr+qxafp%Q`V_kBrF9*vi*# z_o_LqP@+zEOI6fzOV*y&=_P!Vjqgm zk!Pg%+n*;CYV8racW|YevU2(Mv+EAkIR6Pt*helbKAcyktM$r(iUvz;Uc3NHf~{_T zAcmuw#VON^RC#lb<|B1`%dH0DEQUHWyeG%)hvx2f8vN3p<0d)nt3umllb>Zm$tIe5WfYw zgTV;jHsSz|ut5ZHk~rz>S}mkEz8Lb5~?(BVq9 zHfev&u}c?gXe%`f;#!_bkF=tL9gd#p%e!3tIT3={dLCQ1PR)O&}eBCcxVlD@gt@MIJH;-LTaL4l%3oE=7jF%pSWeDvaS+tcSKB(+stI~remsZfgk^3}Mo zUi#-kH*Sa#>T#@weV?|JOgr?5HBmhvtu-7|)nT!%{<5A6n-5=5&-*3J`|J18C0t{V z9ws-+{+Hlrl*d*1+9v!21SMy=Dru+R|SS-TE!b3b(vasc8cVyRqD{*s!miPO;X%>z|pv zARknyJm0{bY=~&OAtq|oyI7A8`|5}5k=z<=T0i&w)}Y4W4_;$fV{Sm-p?9}?WLZkY z=|H{PLS4Q6?bdi}d4Y~xx4{QfmbnnFbg#OST+kcG*VbHII+SX{MNsxRD5)pPiEolN|2zWPn;HEPBF}u(`tL<(W(89 zH5JRK6fRxV_RMAHpjI(#t@*hWuf>tfqqOA$ntI{BuAJa~&Nl7u_a%k@ebiCL=ZdfE zwZ-i->7o9vH)Y6+(zjdf9cNtMyQ}oZo?~WyRw+%jqq>0@d9&AX z#XN?}vAWtP0>ry6RxZ>D$t{z#`${{_H4bJ4_Z_+v{}cBlBg>6(6f0|AVJOoT|0qM~ zz5fvxs81{_bXan~Sk}PuzBQ%)TY5~LfV#qugS!$Xx9_>8q4HT_zsi1$i?K{gb1QCAdPJuH}x%tNIF8{S zzAerg$`y{#>b~I69fz(texC6BVZZA6H%t90uGv$Lzo*ADy0qW(&POKU12%UV3_I~c zZs8k$A@Fidv%dP5P+`+TY4>_U-XMwTe*+z);^E$@^&F!g26^_>kv9gZEP?irU8hDL zadlM`>Z4yMM_h6eAXVQx#S(G+m9?yh>^ukX59nHF8w!`?_zv&`>zGqT{qz%Q#{&D$%d+TI zwqbt_;N*o#ji)do!Im?*`*MP!IryVtYVP5G>=T9#nlyba?D7cX7*4uB;Pz!4RLw34 z3Yb6LUotz;3)Bm=!)!H8A)(M~j)WvlTxSbS4$ckK2cr=alW7pIS2S?-+OE*G-nZ z{hjM@CtT;+TO5IzaBDWhdfH=1YW-)`KnkywY?2%k%Km{WVM3M9-scE*e~p%KfKu2N z#oT}9wovd^_egHp!IHMt8guW3-&CVb{hHOe3xibG&h57Q2PCwNw$ysVYTx9$u7do~ z)8n5E?UdMXrMWX4gL^F!4%^hu%D^^-8$KmIvW^0wDwjZs9 zBrR_@*PdLrp;`U&#x@Wu#18RI+e=72oR<4Ra=Xl8mCj|sqmaz=qug!yjaiy``rfac zlkHX_^0eH^j2gI?n^{i@R4VpXozj&pa5padGlR%k5-a@mb&K4H_7?NI5VfcD;Jh$8 zYscOm-hdK!z(*Zsi;i#-m5SyJsank8wA_Jb?#8e2x1)VV-jP-+NmknH&O@x%J<(FA zEB2i#Vhf!KK2~P8VM)w$aX4JnWHJ>dTMW&WXH5&V{BjTJN(<+1fRqfI`8IX|tRm(4 zl*mFV(gWrfx#(6PndXPe5bwgw;dZhMLPP`h(*wwnfR_De){e+cfLyaOF#&Y;0YFs4 zGQj_$@S0&}{=j{}4gyB{z@KGHWLT;cM^xA`SkDnb z0V(zpLW%#MMCck$)C*DffJ%1L42;qV=*f>}6EF*p(2$7ws*W({K-ohc?+!T5Z(xdu zc88FVfYP=@^uRUhuO&SR)+$zcNbMI2i(b`wWn2RyB+N{wHGOf8TXaRtF3*5?agFr2jl~jV{vz z6gvc1Yuu0r^km)j2-m+K)-Nbtuy~RIW_dA9 zDOTBkVj>@**qssaD&GkB8Bs4=5tM-({7C&*Z70jFxqXw0>23xImcx0+02ij71<1SB zXB@1(TthwqTKuegQ9dFpA=;Rik&zMjx-At!4Wi-<{VQd9uF<8|;ye{dqDUOwC+0z3 z4Vi+H(dl^}E)OrsAWesSSM~kYX`t+aU?PH8S{kC?#Sph&H38!IIXc4lrUCV&08vlU zVrGD{lE#8%hP7hks{90$x793Jn{%zHND?tuA-O8I9$H0y6VLU=k z)9U%(Fr3@l){ckyO`|2LaY$ng~D9EU`Du`>`d zkjNq`Rr17``4sHPi**y9pm7nc6;$D-W*`Xz9qTO$(S?U$o$9P}GxVrx=t3I_COD-r zrj0ptu@&HpqS~vKW}WLC$#~RVV|j7YKe{g6o@R06mD_+i3!7?W*zx zv|}PzI*^nCfkCRn#dcc7&NT{WMlz_4h>00%MSDc{Un7H}ktGl~ z4Jr0m!Gt@&UPDIN(Fr_UVk-gr zBd;}PlogWMJX(v*xiso+)}EFaQMpu`fQeq(xE#uQ+aT}Kr0RZkLisZupSO+E+@Qh; z*?8o~Pw~7Cx0-jjWNJ-kIZ3}FG|E44(`fhnxSqa&7Wr9IV@1$HinY?6pkvDQZa%FY zn`=%pPpIU?k?NK!gL$0j!DqF7xf{dVVs0-Ihf4xpTW(6M8{RFU`YmAO-A+Owo! Date: Tue, 16 Dec 2025 13:50:09 +0530 Subject: [PATCH 4/5] Fix modified --- src/Controls/src/Core/TitleBar/TitleBar.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Controls/src/Core/TitleBar/TitleBar.cs b/src/Controls/src/Core/TitleBar/TitleBar.cs index f635ebdcf993..2e0d9d2987ce 100644 --- a/src/Controls/src/Core/TitleBar/TitleBar.cs +++ b/src/Controls/src/Core/TitleBar/TitleBar.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Graphics; @@ -348,11 +349,9 @@ static View BuildDefaultTemplate() var contentGrid = new Grid() { #if MACCATALYST -#if MACCATALYST26_0_OR_GREATER - Margin = new Thickness(90, 0, 0, 0), -#else - Margin = new Thickness(80, 0, 0, 0), -#endif + Margin = OperatingSystem.IsMacCatalystVersionAtLeast(26) + ? new Thickness(90, 0, 0, 0) + : new Thickness(80, 0, 0, 0), #endif HorizontalOptions = LayoutOptions.Fill, ColumnDefinitions = From 5a57f2bdd68a345533f745a63a78c6c4a34981d7 Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Fri, 19 Dec 2025 09:53:01 +0100 Subject: [PATCH 5/5] Fix formatting issues in test files - Remove unused 'using System.Collections.ObjectModel' import - Fix inconsistent indentation (mixed tabs/spaces) - Fix class declaration indentation in Shared.Tests - Add newline at end of files --- .../TestCases.HostApp/Issues/Issue33136.cs | 29 +++++++++---------- .../Tests/Issues/Issue33136.cs | 28 +++++++++--------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs index 0c2a4cdaad39..031543c925e8 100644 --- a/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue33136.cs @@ -1,14 +1,11 @@ -using System.Collections.ObjectModel; - namespace Maui.Controls.Sample.Issues; [Issue(IssueTracker.Github, 33136, "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version", PlatformAffected.macOS)] - public class Issue33136 : ContentPage { public Issue33136() - { - // Create TitleBar + { + // Create TitleBar var titleBar = new TitleBar { Title = "Maui App", @@ -17,7 +14,7 @@ public Issue33136() HeightRequest = 48 }; - titleBar.LeadingContent = new Image {Source = "dotnet_bot.png", HeightRequest = 24}; + titleBar.LeadingContent = new Image { Source = "dotnet_bot.png", HeightRequest = 24 }; // Set the TitleBar on the current Window when this page appears this.Loaded += (sender, e) => @@ -35,15 +32,15 @@ public Issue33136() Padding = new Thickness(30), VerticalOptions = LayoutOptions.Center, Children = + { + new Label { - new Label - { - Text = "TitleBar should be aligned properly", - AutomationId = "TitleBarAlignmentLabel", - FontSize = 32, - HorizontalOptions = LayoutOptions.Center - }, - } + Text = "TitleBar should be aligned properly", + AutomationId = "TitleBarAlignmentLabel", + FontSize = 32, + HorizontalOptions = LayoutOptions.Center + }, + } }; - } -} \ No newline at end of file + } +} diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs index 1bcefdb58925..638176ca5ec5 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33136.cs @@ -1,20 +1,22 @@ -#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_IOS // TitleBar is only applicable for Windows and macOS +#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_IOS // TitleBar is only applicable for Windows and macOS using NUnit.Framework; using UITest.Appium; using UITest.Core; namespace Microsoft.Maui.TestCases.Tests.Issues; - public class Issue33136 : _IssuesUITest - { - public Issue33136(TestDevice device) : base(device) { } - public override string Issue => "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version"; - [Test] - [Category(UITestCategories.Window)] - public void VerifyTitleBarAlignment() - { - App.WaitForElement("TitleBarAlignmentLabel"); - VerifyScreenshot(includeTitleBar: true); - } +public class Issue33136 : _IssuesUITest +{ + public Issue33136(TestDevice device) : base(device) { } + + public override string Issue => "TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version"; + + [Test] + [Category(UITestCategories.Window)] + public void VerifyTitleBarAlignment() + { + App.WaitForElement("TitleBarAlignmentLabel"); + VerifyScreenshot(includeTitleBar: true); } -#endif \ No newline at end of file +} +#endif