From c787df001b6b3ae16cd22febfbee043b512b1422 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 20 Nov 2018 17:37:17 +0800
Subject: [PATCH] add groupbox style

---
 HandyControl/HandyControl.csproj              |   8 +++
 .../Themes/Styles/Base/GroupBoxBaseStyle.xaml |  35 ++++++++++++
 HandyControl/Themes/Styles/GroupBox.xaml      |  52 ++++++++++++++++++
 HandyControl/Themes/Styles/Style.xaml         |   1 +
 HandyControlDemo/Data/MessageToken.cs         |   2 +
 HandyControlDemo/Data/MessageToken.tt         |   3 +-
 HandyControlDemo/HandyControlDemo.csproj      |   8 +++
 .../Properties/Langs/Lang.Designer.cs         |   9 +++
 .../Properties/Langs/Lang.en.resx             |   3 +
 HandyControlDemo/Properties/Langs/Lang.resx   |   3 +
 .../Img/LeftMainContent/GroupBox_16x.png      | Bin 0 -> 192 bytes
 .../UserControl/Main/LeftMainContent.xaml     |   5 ++
 .../UserControl/Styles/GroupBoxDemoCtl.xaml   |  28 ++++++++++
 .../Styles/GroupBoxDemoCtl.xaml.cs            |  10 ++++
 14 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml
 create mode 100644 HandyControl/Themes/Styles/GroupBox.xaml
 create mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png
 create mode 100644 HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml
 create mode 100644 HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs

diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 60886f13..fca70629 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -267,6 +267,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\GroupBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Styles\Base\GroupBoxBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\LabelBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml
new file mode 100644
index 00000000..69d1f5fa
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml
@@ -0,0 +1,35 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <Style x:Key="GroupBoxBaseStyle" TargetType="GroupBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="controls:TitleElement.Background" Value="{DynamicResource TitleBrush}"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GroupBox">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" MinHeight="30"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Border MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(controls:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,0,6">
+                            <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}"  Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <Border Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/GroupBox.xaml b/HandyControl/Themes/Styles/GroupBox.xaml
new file mode 100644
index 00000000..eda414ae
--- /dev/null
+++ b/HandyControl/Themes/Styles/GroupBox.xaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/GroupBoxBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox"/>
+
+    <Style x:Key="GroupBoxOriginal" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GroupBox">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0,10,6" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <Border Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="GroupBoxTab" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GroupBox">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" MinHeight="30"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Border Grid.Row="1" CornerRadius="0,0,4,4" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <Border Grid.Row="0" MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(controls:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="4,4,0,0">
+                            <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 6c487bf3..cb06d590 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -40,6 +40,7 @@
         <ResourceDictionary Source="ImageViewer.xaml"/>
         <ResourceDictionary Source="CalendarWithClock.xaml"/>
         <ResourceDictionary Source="DateTimePicker.xaml"/>
+        <ResourceDictionary Source="GroupBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index d1ca4a80..25063999 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -94,6 +94,8 @@
 
         public static readonly string SliderDemoCtl = nameof(SliderDemoCtl);
 
+        public static readonly string GroupBoxDemoCtl = nameof(GroupBoxDemoCtl);
+
         public static readonly string CommonWindow = nameof(CommonWindow);
 
         public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index de08920d..e8167844 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -52,7 +52,8 @@ var styleList = new List<string>
 	"RadioButtonDemoCtl",
 	"NaiveScrollViewerDemoCtl",
 	"BrushDemoCtl",
-	"SliderDemoCtl"
+	"SliderDemoCtl",
+	"GroupBoxDemoCtl"
 };
 var windowList = new List<string>
 {
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 7cc7a554..07803abd 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -183,6 +183,9 @@
     <Compile Include="UserControl\Styles\CheckBoxDemoCtl.xaml.cs">
       <DependentUpon>CheckBoxDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
+      <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml.cs">
       <DependentUpon>NaiveComboBoxDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -437,6 +440,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControl\Styles\GroupBoxDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -557,6 +564,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MessageToken.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Img\LeftMainContent\GroupBox_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\ColorWheel_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\Slider_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\HoverMenu_16x.png" />
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index f1b96921..68444cd4 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -375,6 +375,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 分组框 的本地化字符串。
+        /// </summary>
+        public static string GroupBox {
+            get {
+                return ResourceManager.GetString("GroupBox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 信息通知 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 454724c4..f8dd5ef9 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -405,4 +405,7 @@
   <data name="DateTimePicker" xml:space="preserve">
     <value>DateTimePicker</value>
   </data>
+  <data name="GroupBox" xml:space="preserve">
+    <value>GroupBox</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index e4f29540..1940e084 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -385,4 +385,7 @@
   <data name="DateTimePicker" xml:space="preserve">
     <value>日期时间选择器</value>
   </data>
+  <data name="GroupBox" xml:space="preserve">
+    <value>分组框</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5d1ce5fc54d6c915e7c80f24e97ea1ac327c57
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP_W3;
z#WAEJ?(L+FTnz?1F4-@y<ey$tw|v)^+gz^}lvr$FH=J<vXtMy9{`BmZ0&=Ui#vKee
zw{vzUPsfSubk%#O4Cc@5XJD8bbcIjsYHVVxnenHM^Lw+G?q}R4d5OnjQ|=54r6;~0
nS`X$=VDS0;!uWvu$5(72v(2;0Ov0xEZD;Uw^>bP0l+XkK7o$fG

literal 0
HcmV?d00001

diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index fd426cf5..19955c37 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -110,6 +110,11 @@
                         <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
+                <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GroupBoxDemoCtl}" Content="{x:Static langs:Lang.GroupBox}">
+                    <controls:EdgeElement.LeftContent>
+                        <Image Source="../../Resources/Img/LeftMainContent/GroupBox_16x.png"/>
+                    </controls:EdgeElement.LeftContent>
+                </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.MenuDemoCtl}" Content="{x:Static langs:Lang.Menu}">
                     <controls:EdgeElement.LeftContent>
                         <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png"/>
diff --git a/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml
new file mode 100644
index 00000000..e33235c7
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="HandyControlDemo.UserControl.GroupBoxDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="{DynamicResource RegionBrush}"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
+    <controls:TransitioningContentControl>
+        <ScrollViewer>
+            <UniformGrid Margin="32">
+                <GroupBox Width="300" Height="300" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16">
+                    <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+                        <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    </Border>
+                </GroupBox>
+                <GroupBox Width="300" Height="300" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left">
+                    <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+                        <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    </Border>
+                </GroupBox>
+                <GroupBox Width="300" Height="300" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" Style="{StaticResource GroupBoxTab}">
+                    <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+                        <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    </Border>
+                </GroupBox>
+            </UniformGrid>
+        </ScrollViewer>
+    </controls:TransitioningContentControl>
+</UserControl>
diff --git a/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
new file mode 100644
index 00000000..0489fb71
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class GroupBoxDemoCtl
+    {
+        public GroupBoxDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}