Update Styles.GroupBox.xaml

WPFDevelopersOrg · Aug 6, 2023 · 6f58c14 · 6f58c14
1 parent 99b44cf
commit 6f58c14
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
@@ -11,6 +11,8 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type GroupBox}">
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
@@ -21,24 +23,20 @@
                         </Grid.RowDefinitions>
                         <Border
                             Grid.Row="0"
-                            BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-                            </Border.Background>
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
+                                VerticalAlignment="Center"
                                 ContentSource="Header"
                                 RecognizesAccessKey="True" />
                         </Border>
                         <Border
                             Grid.Row="1"
-                            BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1,0,1,1"
                             SnapsToDevicePixels="True">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-                            </Border.Background>
                             <ContentPresenter Margin="{TemplateBinding Padding}" />
                         </Border>
                     </Grid>