Merge pull request #678 from niels9001/niels9001/togglebutton-fix

TitleBar tweaks
lepoco · Jun 30, 2023 · 8d459f4 · 8d459f4
2 parents 50646c9 + c0ebbad
commit 8d459f4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -107,10 +107,12 @@
         </Setter>
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Padding" Value="16" />
+        <Setter Property="Padding" Value="16,4,16,4" />
         <Setter Property="FontSize" Value="12" />
+        <Setter Property="Height" Value="48" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Focusable" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
@@ -119,7 +121,7 @@
                     <Grid
                         x:Name="PART_MainGrid"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                         Background="{TemplateBinding Background}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -144,8 +146,8 @@
                             <ContentPresenter
                                 x:Name="PART_Icon"
                                 Grid.Column="0"
-                                Height="19"
-                                Margin="0,0,6,0"
+                                Height="16"
+                                Margin="0,0,12,0"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Icon}"
                                 Focusable="False"