Merge pull request #349 from CommunityToolkit/users/niels9001/settingscontrols-fixes

[SettingsControls] Minor UI tweaks

Author: michael-hawker

labs/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj

@@ -18,7 +18,7 @@
     <Description>
       This package contains the SettingsCard and SettingsExpander controls.
     </Description>
-    <Version>0.0.11</Version>
+    <Version>0.0.12</Version>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 

labs/SettingsControls/src/SettingsCard/SettingsCard.xaml

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:labs="using:CommunityToolkit.Labs.WinUI"
@@ -305,8 +305,8 @@
                                             <Setter Target="PART_HeaderIconPresenterHolder.Visibility" Value="Collapsed" />
                                             <Setter Target="PART_DescriptionPresenter.Visibility" Value="Collapsed" />
                                             <Setter Target="PART_HeaderPresenter.Visibility" Value="Collapsed" />
-                                            <Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
-                                            <Setter Target="PART_ActionIconPresenter.(Grid.Row)" Value="0" />
+                                            <Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+                                            <Setter Target="PART_ContentPresenter.(Grid.Column)" Value="1" />
                                             <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Left" />
                                         </VisualState.Setters>
                                     </VisualState>
@@ -322,6 +322,7 @@
                                             <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
                                             <Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Left" />
                                             <Setter Target="PART_ContentPresenter.Margin" Value="{ThemeResource SettingsCardVerticalHeaderContentSpacing}" />
+                                            <Setter Target="HeaderPanel.Margin" Value="0" />
                                         </VisualState.Setters>
                                     </VisualState>
                                     <VisualState x:Name="RightWrappedNoIcon">
@@ -336,6 +337,7 @@
                                             <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
                                             <Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Left" />
                                             <Setter Target="PART_ContentPresenter.Margin" Value="{ThemeResource SettingsCardVerticalHeaderContentSpacing}" />
+                                            <Setter Target="HeaderPanel.Margin" Value="0" />
                                         </VisualState.Setters>
                                     </VisualState>
                                     <VisualState x:Name="Vertical">
@@ -364,8 +366,9 @@
                                                   Content="{TemplateBinding HeaderIcon}" />
                             </Viewbox>
 
-                            <StackPanel Grid.Column="1"
-                                        Margin="0,0,12,0"
+                            <StackPanel x:Name="HeaderPanel"
+                                        Grid.Column="1"
+                                        Margin="0,0,24,0"
                                         VerticalAlignment="Center"
                                         Orientation="Vertical">
                                 <ContentPresenter x:Name="PART_HeaderPresenter"
@@ -408,7 +411,6 @@
 
                             <ContentPresenter x:Name="PART_ContentPresenter"
                                               Grid.Column="2"
-                                              MinWidth="{ThemeResource SettingsCardContentMinWidth}"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
                                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"