From 8923dce4430458d0a42b658477b75b061527a985 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 28 Jan 2019 18:58:25 +0800
Subject: [PATCH] init branch

---
 HandyControl/Controls/Other/ChatBubble.cs         |   9 +++++++++
 HandyControl/HandyControl.csproj                  |   9 +++++++++
 .../Themes/Styles/Base/ChatBubbleBaseStyle.xaml   |   9 +++++++++
 HandyControl/Themes/Styles/ChatBubble.xaml        |  10 ++++++++++
 HandyControl/Themes/Styles/Style.xaml             |   1 +
 HandyControl/Themes/Styles/Window.xaml            |   8 ++++----
 HandyControlDemo/Data/MessageToken.cs             |   2 ++
 HandyControlDemo/Data/MessageToken.tt             |   3 ++-
 HandyControlDemo/HandyControlDemo.csproj          |   8 ++++++++
 .../Properties/Langs/Lang.Designer.cs             |  11 ++++++++++-
 HandyControlDemo/Properties/Langs/Lang.en.resx    |   3 +++
 HandyControlDemo/Properties/Langs/Lang.resx       |   3 +++
 .../Img/LeftMainContent/Bubble_16xLG.png          | Bin 0 -> 312 bytes
 .../UserControl/Controls/ChatBubbleDemoCtl.xaml   |   9 +++++++++
 .../Controls/ChatBubbleDemoCtl.xaml.cs            |  10 ++++++++++
 .../UserControl/Main/LeftMainContent.xaml         |   7 ++++++-
 16 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 HandyControl/Controls/Other/ChatBubble.cs
 create mode 100644 HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
 create mode 100644 HandyControl/Themes/Styles/ChatBubble.xaml
 create mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/Bubble_16xLG.png
 create mode 100644 HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
 create mode 100644 HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs

diff --git a/HandyControl/Controls/Other/ChatBubble.cs b/HandyControl/Controls/Other/ChatBubble.cs
new file mode 100644
index 00000000..ffc2c6b6
--- /dev/null
+++ b/HandyControl/Controls/Other/ChatBubble.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class ChatBubble : ContentControl
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 5b0fc2e8..01dcb6c7 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -110,6 +110,7 @@
     <Compile Include="Controls\Button\ContextMenuToggleButton.cs" />
     <Compile Include="Controls\Other\Carousel.cs" />
     <Compile Include="Controls\Cover\CoverView\CoverView.cs" />
+    <Compile Include="Controls\Other\ChatBubble.cs" />
     <Compile Include="Controls\Transfer\Transfer.cs" />
     <Compile Include="Controls\Transfer\TransferGroup.cs" />
     <Compile Include="Controls\Transfer\TransferItem.cs" />
@@ -356,6 +357,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\ChatBubbleBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\CheckBoxBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -408,6 +413,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\ChatBubble.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\CoverFlow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
new file mode 100644
index 00000000..876115c3
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
@@ -0,0 +1,9 @@
+<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="ChatBubbleBaseStyle" TargetType="controls:ChatBubble">
+
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/ChatBubble.xaml b/HandyControl/Themes/Styles/ChatBubble.xaml
new file mode 100644
index 00000000..ce52e400
--- /dev/null
+++ b/HandyControl/Themes/Styles/ChatBubble.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/ChatBubbleBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="controls:ChatBubble"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 329ca1c1..4c60d443 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -56,6 +56,7 @@
         <ResourceDictionary Source="CoverFlow.xaml"/>
         <ResourceDictionary Source="ProgressButton.xaml"/>
         <ResourceDictionary Source="Transfer.xaml"/>
+        <ResourceDictionary Source="ChatBubble.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Window.xaml b/HandyControl/Themes/Styles/Window.xaml
index 0f4a3cef..27d9619d 100644
--- a/HandyControl/Themes/Styles/Window.xaml
+++ b/HandyControl/Themes/Styles/Window.xaml
@@ -56,15 +56,15 @@
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="NonClientAreaBackground" Value="White"/>
-        <Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="NonClientAreaForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="CloseButtonBackground" Value="Transparent"/>
-        <Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="CloseButtonForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="CloseButtonHoverBackground" Value="#e81123"/>
         <Setter Property="CloseButtonHoverForeground" Value="White"/>
         <Setter Property="OtherButtonBackground" Value="Transparent"/>
-        <Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="OtherButtonForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="OtherButtonHoverBackground" Value="#e5e5e5"/>
-        <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Window">
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 4acc6bc8..ff8d59f7 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -80,6 +80,8 @@
 	
         public static readonly string TransferDemoCtl = nameof(TransferDemoCtl);
 	
+        public static readonly string ChatBubbleDemoCtl = nameof(ChatBubbleDemoCtl);
+	
         public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
 
         public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index eccec53a..4fcd0b93 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -42,7 +42,8 @@ var controlList = new List<string>
 	"CoverViewDemoCtl",
 	"CoverFlowDemoCtl",
 	"ProgressButtonDemoCtl",
-	"TransferDemoCtl"
+	"TransferDemoCtl",
+	"ChatBubbleDemoCtl"
 };
 var styleList = new List<string>
 {
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index d6e2a191..77747122 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -132,6 +132,9 @@
     <Compile Include="UserControl\Controls\CarouselDemoCtl.xaml.cs">
       <DependentUpon>CarouselDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\Controls\ChatBubbleDemoCtl.xaml.cs">
+      <DependentUpon>ChatBubbleDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
       <DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -420,6 +423,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControl\Controls\ChatBubbleDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Controls\CirclePanelDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -718,6 +725,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MessageToken.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Img\LeftMainContent\Bubble_16xLG.png" />
     <Resource Include="Resources\Img\LeftMainContent\Transfer_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\ProgressButton_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\SortAscending_grey_16x.png" />
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 3c796f03..be8b0678 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性
         ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -177,6 +177,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 对话气泡 的本地化字符串。
+        /// </summary>
+        public static string ChatBubble {
+            get {
+                return ResourceManager.GetString("ChatBubble", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 讨论室 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index b5f89cec..a5a05bf5 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -486,4 +486,7 @@
   <data name="Transfer" xml:space="preserve">
     <value>Transfer</value>
   </data>
+  <data name="ChatBubble" xml:space="preserve">
+    <value>ChatBubble</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index eb581357..4a851ecc 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -486,4 +486,7 @@
   <data name="Transfer" xml:space="preserve">
     <value>穿梭框</value>
   </data>
+  <data name="ChatBubble" xml:space="preserve">
+    <value>对话气泡</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/Bubble_16xLG.png b/HandyControlDemo/Resources/Img/LeftMainContent/Bubble_16xLG.png
new file mode 100644
index 0000000000000000000000000000000000000000..c73fba3710e655814a866c82227377f5ae88e23a
GIT binary patch
literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000ie
z000ie0hKEb8vp<R>PbXFRCr#^l0S-rKop0+h?O>0)*DZd(smY0LA;43=g1;XuCad#
zONm#=4U!|I(RSCjAV?U7OqZ{e_x%{(`)vTGY1#n;5b+#$Km|c?*(`F?G*RF8JVTac
zR8{pK;<?I#%!(tf4=ggr;|JTfEjF&VD~H2gLgW>Z#|pb_p7C(!l>=l!CTuf4aG&og
zmyqqU=Iir&*}Aa{;(CCRQpkr##&P7NwY5mbD(88Qpwv6Va3)C-+O{=UnFr>uUkO+U
z!w{`CaU7Sk@Z)@ix~@fT7TGDFC<@Xvz07ir8GH<MUAO+%5(|F--(mg)sWm460000<
KMNUMnLSTZ{WP&^Z

literal 0
HcmV?d00001

diff --git a/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
new file mode 100644
index 00000000..40978f4f
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
@@ -0,0 +1,9 @@
+<UserControl x:Class="HandyControlDemo.UserControl.ChatBubbleDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             Background="{DynamicResource RegionBrush}">
+    <controls:TransitioningContentControl>
+            
+    </controls:TransitioningContentControl>
+</UserControl>
diff --git a/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
new file mode 100644
index 00000000..6c68a1de
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class ChatBubbleDemoCtl
+    {
+        public ChatBubbleDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 55696833..3b7dceee 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -187,6 +187,11 @@
                             <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
+                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
+                        <controls:EdgeElement.LeftContent>
+                            <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
+                        </controls:EdgeElement.LeftContent>
+                    </ListBoxItem>
                     <ListBoxItem Tag="{x:Static data:MessageToken.NumericUpDownDemoCtl}" Content="{x:Static langs:Lang.NumericUpDown}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png"/>
@@ -277,7 +282,7 @@
                             <Image Source="../../Resources/Img/LeftMainContent/ColorWheel_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
                         </controls:EdgeElement.LeftContent>