Merge pull request #507 from AndreasReitberger/506-shellitemtemplate-…

…looks-odd-on-macos Fixed `ShellItemTemplates` for `MacOS`
AndreasReitberger · May 10, 2024 · ac0ca85 · ac0ca85
2 parents 653adc1 + ee0461b
commit ac0ca85
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml
@@ -21,8 +21,8 @@
         <Grid
             x:Name="FlyoutItemLayout"
             HeightRequest="{OnPlatform 44, Android=50}"
-            ColumnSpacing="{OnPlatform WinUI=0}"
-            RowSpacing="{OnPlatform WinUI=0}"
+            ColumnSpacing="{OnPlatform WinUI=0, MacCatalyst=0}"
+            RowSpacing="{OnPlatform WinUI=0, MacCatalyst=0}"
             >
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroupList>
@@ -36,38 +36,38 @@
                             <VisualState.Setters>
                                 <Setter
                                     Property="Background"
-                                    Value="{OnPlatform WinUI=Transparent, Default={AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}}"
+                                    Value="{OnPlatform WinUI=Transparent, MacCatalyst=Transparent, Default={AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}}"
                                     />
                             </VisualState.Setters>
                         </VisualState>
                         <VisualState x:Name="Disabled">
                             <VisualState.Setters>
                                 <Setter
                                     Property="Background"
-                                    Value="{OnPlatform WinUI=Transparent, Default={AppThemeBinding Light={StaticResource Gray500}, Dark={StaticResource Gray500}}}"
+                                    Value="{OnPlatform WinUI=Transparent, MacCatalyst=Transparent, Default={AppThemeBinding Light={StaticResource Gray500}, Dark={StaticResource Gray500}}}"
                                     />
                             </VisualState.Setters>
                         </VisualState>
                     </VisualStateGroup>
                 </VisualStateGroupList>
             </VisualStateManager.VisualStateGroups>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{OnPlatform Android=54, iOS=50, WinUI=Auto}" />
+                <ColumnDefinition Width="{OnPlatform Android=54, iOS=50, WinUI=Auto, MacCatalyst=Auto}" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
             <Image
                 x:Name="FlyoutItemImage"
                 Source="{Binding FlyoutIcon}"
                 VerticalOptions="Center"
-                HorizontalOptions="{OnPlatform Default=Center, WinUI=Start}"
-                HeightRequest="{OnPlatform Android=20, iOS=18, WinUI=16}"
-                WidthRequest="{OnPlatform Android=204, iOS=18, WinUI=16}"
+                HorizontalOptions="{OnPlatform Default=Center, WinUI=Start, MacCatalyst=Start}"
+                HeightRequest="{OnPlatform Android=20, iOS=18, WinUI=16, MacCatalyst=16}"
+                WidthRequest="{OnPlatform Android=204, iOS=18, WinUI=16, MacCatalyst=16}"
                 >
                 <Image.Margin>
                     <OnPlatform x:TypeArguments="Thickness">
                         <OnPlatform.Platforms>
-                            <On Platform="WinUI"
-                            Value="12,0,12,0" />
+                            <On Platform="WinUI" Value="12,0,12,0" />
+                            <On Platform="MacCatalyst" Value="12,0,12,0" />
                         </OnPlatform.Platforms>
                     </OnPlatform>
                 </Image.Margin>
@@ -79,8 +79,8 @@
                 FontSize="{OnPlatform Android=14, iOS=14}"
                 FontAttributes="{OnPlatform iOS=Bold}"
                 FontFamily="{StaticResource MontserratMedium}"
-                HorizontalOptions="{OnPlatform WinUI=Start}"
-                HorizontalTextAlignment="{OnPlatform WinUI=Start}"
+                HorizontalOptions="{OnPlatform WinUI=Start, MacCatalyst=Start}"
+                HorizontalTextAlignment="{OnPlatform WinUI=Start, MacCatalyst=Start}"
                 VerticalTextAlignment="Center"
                 Style="{StaticResource Style.Core.Label.Default}"
                 TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"