From 77f4d0199e367e9b56daf7abb086cb770563ee3f Mon Sep 17 00:00:00 2001
From: chenjie02_cd <chenjie02@cd.baidu.com>
Date: Sat, 3 Jul 2021 16:26:43 +0800
Subject: [PATCH] add ElementGroup demo

---
 .../HandyControlDemo_Code.csproj              |  7 ++++++
 .../Data/DemoInfo.json                        |  5 ++--
 .../HandyControlDemo_Shared.projitems         |  7 ++++++
 .../Properties/Langs/Lang.Designer.cs         | 11 ++++++++
 .../Properties/Langs/Lang.ca-ES.resx          |  3 +++
 .../Properties/Langs/Lang.en.resx             |  3 +++
 .../Properties/Langs/Lang.fa.resx             |  3 +++
 .../Properties/Langs/Lang.fr.resx             |  3 +++
 .../Properties/Langs/Lang.ko-KR.resx          |  3 +++
 .../Properties/Langs/Lang.pl.resx             |  3 +++
 .../Properties/Langs/Lang.pt-BR.resx          |  3 +++
 .../Properties/Langs/Lang.resx                |  3 +++
 .../Properties/Langs/Lang.ru.resx             |  3 +++
 .../Properties/Langs/Lang.tr.resx             |  3 +++
 .../Properties/Langs/LangProvider.cs          | 11 ++++++++
 .../Controls/ElementGroupDemoCtl.xaml         | 25 +++++++++++++++++++
 .../Controls/ElementGroupDemoCtl.xaml.cs      | 10 ++++++++
 17 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs

diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index c116cdcd..d735ac7c 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -113,6 +113,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\DrawerDemoCtl.xaml">
       <Link>UserControl\Controls\DrawerDemoCtl.xaml</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\ElementGroupDemoCtl.xaml">
+      <Link>UserControl\Controls\ElementGroupDemoCtl.xaml</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlexPanelDemoCtl.xaml">
       <Link>UserControl\Controls\FlexPanelDemoCtl.xaml</Link>
     </Resource>
@@ -504,6 +507,10 @@
       <Link>UserControl\Controls\DrawerDemoCtl.xaml.cs</Link>
       <DependentUpon>DrawerDemoCtl.xaml</DependentUpon>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\ElementGroupDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ElementGroupDemoCtl.xaml.cs</Link>
+      <DependentUpon>ElementGroupDemoCtl.xaml</DependentUpon>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
       <Link>UserControl\Controls\FlexPanelDemoCtl.xaml.cs</Link>
       <DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index 97874f39..a767567c 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -34,7 +34,7 @@
       [ "Label", "LabelDemoCtl", "Label_16x", "", "" ],
       [ "Frame", "FrameDemoCtl", "frame_16xLG", "", "" ],
       [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "", "" ],
-      [ "Geometry", "GeometryDemoCtl", "Path_16x", "1", "" ]
+      [ "Geometry", "GeometryDemoCtl", "Path_16x", "", "" ]
     ]
   },
   {
@@ -43,7 +43,7 @@
     "group": true,
     "demoItemList": [
       [ "FloatingBlock", "FloatingBlockDemoCtl", "thumbs_up", "", "Interacting" ],
-      [ "PropertyGrid", "PropertyGridDemoCtl", "PropertyGridEditorPart_16x", "1", "DataEntry" ],
+      [ "PropertyGrid", "PropertyGridDemoCtl", "PropertyGridEditorPart_16x", "", "DataEntry" ],
       [ "ImageSelector", "ImageSelectorDemoCtl", "Image_16x", "1", "DataEntry" ],
       [ "ImageBlock", "ImageBlockDemoCtl", "ImageStack_16x", "", "DataDisplay" ],
       [ "Magnifier", "MagnifierDemoCtl", "Search_16x", "", "Interacting" ],
@@ -74,6 +74,7 @@
       [ "OutlineText", "OutlineTextDemoCtl", "TextBlock_16x", "", "DataDisplay" ],
       [ "RunningBlock", "RunningBlockDemoCtl", "Dynamic_16x", "", "DataDisplay" ],
       [ "Card", "CardDemoCtl", "VSO_Card_16x", "", "DataDisplay" ],
+      [ "ElementGroup", "ElementGroupDemoCtl", "ButtonGroup_16x", "1", "Layout" ],
       [ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "", "Layout" ],
       [ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "", "Layout" ],
       [ "Grid", "GridDemoCtl", "GridPane_16x", "", "Layout" ],
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 6e928818..2d609b3b 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -59,6 +59,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml.cs">
       <DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ElementGroupDemoCtl.xaml.cs">
+      <DependentUpon>ElementGroupDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
       <DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -539,6 +542,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ElementGroupDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 87d1c04e..911f565e 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -718,6 +718,17 @@ namespace HandyControlDemo.Properties.Langs
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to 元素组.
+        /// </summary>
+        public static string ElementGroup
+        {
+            get
+            {
+                return ResourceManager.GetString("ElementGroup", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to 邮箱.
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
index f1f00611..f46c26b4 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index 83434bcd..76e2f64d 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
index 79896305..f3343209 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
index dc8c74ba..005659a7 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
index 045f36be..5f795e6a 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
index 9fff02fa..ff19a815 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
index 75e37f07..d59601c3 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index d0db53b2..033454bb 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>空状态</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>元素组</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
index d50b468e..c6906b6c 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
index aa64d6a7..43349182 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
@@ -795,4 +795,7 @@
   <data name="Empty" xml:space="preserve">
     <value>Empty</value>
   </data>
+  <data name="ElementGroup" xml:space="preserve">
+    <value>ElementGroup</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
index 9d7c17d4..ea501923 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -96,6 +96,7 @@ namespace HandyControlDemo.Properties.Langs
             OnPropertyChanged(nameof(DragHere));
             OnPropertyChanged(nameof(Drawer));
             OnPropertyChanged(nameof(Effects));
+            OnPropertyChanged(nameof(ElementGroup));
             OnPropertyChanged(nameof(Email));
             OnPropertyChanged(nameof(Empty));
             OnPropertyChanged(nameof(Error));
@@ -560,6 +561,11 @@ namespace HandyControlDemo.Properties.Langs
         /// </summary>
 		public string Effects => Lang.Effects;
 
+        /// <summary>
+        ///   查找类似 元素组 的本地化字符串。
+        /// </summary>
+        public string ElementGroup => Lang.ElementGroup;
+
         /// <summary>
         ///   查找类似 邮箱 的本地化字符串。
         /// </summary>
@@ -1699,6 +1705,11 @@ namespace HandyControlDemo.Properties.Langs
         /// </summary>
 		public static string Effects = nameof(Effects);
 
+        /// <summary>
+        ///   查找类似 元素组 的本地化字符串。
+        /// </summary>
+        public static string ElementGroup = nameof(ElementGroup);
+
         /// <summary>
         ///   查找类似 邮箱 的本地化字符串。
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
new file mode 100644
index 00000000..bea3e62a
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
@@ -0,0 +1,25 @@
+<UserControl x:Class="HandyControlDemo.UserControl.ElementGroupDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             Background="{DynamicResource RegionBrush}"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension">
+    <hc:TransitioningContentControl>
+        <StackPanel Margin="32" VerticalAlignment="Center">
+            <hc:ElementGroup Orientation="Horizontal">
+                <Border Style="{StaticResource BorderRegion}" Padding="6,0">
+                    <Path Data="{StaticResource ClockGeometry}" Width="16" Height="16" Stretch="Uniform" Fill="{DynamicResource BorderBrush}"/>
+                </Border>
+                <TextBox MinWidth="200"/>
+                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+            </hc:ElementGroup>
+            <hc:ElementGroup Margin="0,16,0,0">
+                <TextBox/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+            </hc:ElementGroup>
+        </StackPanel>
+    </hc:TransitioningContentControl>
+</UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
new file mode 100644
index 00000000..e18109c3
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class ElementGroupDemoCtl
+    {
+        public ElementGroupDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}