From c2c6dbe490a26bed0f963463c7ac677ab3406484 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 2 Feb 2021 00:27:59 +0800
Subject: [PATCH] fixed #456

---
 .../Styles/Base/CheckComboBoxBaseStyle.xaml       | 14 +++++++-------
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml  | 13 ++++++-------
 .../Controls/Input/CheckComboBox/CheckComboBox.cs | 15 ++++++++++++++-
 .../Styles/Base/CheckComboBoxBaseStyle.xaml       | 14 +++++++-------
 src/Shared/HandyControl_Shared/Themes/Theme.xaml  | 13 ++++++-------
 5 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
index 868680aa..cbede491 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
@@ -40,12 +40,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="ClickMode" Value="Press"/>
+    <Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+        <Setter Property="ClickMode" Value="Release"/>
+    </Style>
+
+    <Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+        <Setter Property="ClickMode" Value="Release"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
@@ -126,7 +126,7 @@
                     </hc:ToggleBlock>
                 </Border>
             </Popup>
-            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}"/>
+            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}"/>
             <Border Grid.Column="0" Margin="-1,1">
                 <WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
             </Border>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 1e573d22..e65caab0 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -6733,12 +6733,11 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Focusable" Value="false" />
-		<Setter Property="ClickMode" Value="Press" />
+	<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
+	</Style>
+	<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">
@@ -6817,7 +6816,7 @@
 					</hc:ToggleBlock>
 				</Border>
 			</Popup>
-			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}" />
+			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
 			<Border Grid.Column="0" Margin="-1,1">
 				<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
 			</Border>
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
index 169a3e69..4c0b516a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
@@ -74,7 +74,20 @@ namespace HandyControl.Controls
         }
 
         public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-            "IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+            "IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDropDownOpenChanged));
+
+        private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (CheckComboBox) d;
+
+            if (!(bool) e.NewValue)
+            {
+                ctl.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    Mouse.Capture(null);
+                }), DispatcherPriority.Send);
+            }
+        }
 
         public bool IsDropDownOpen
         {
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
index 08b8d826..69e2c55b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
@@ -40,12 +40,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="ClickMode" Value="Press"/>
+    <Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+        <Setter Property="ClickMode" Value="Release"/>
+    </Style>
+
+    <Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+        <Setter Property="ClickMode" Value="Release"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
@@ -126,7 +126,7 @@
                     </hc:ToggleBlock>
                 </Border>
             </Popup>
-            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}"/>
+            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}"/>
             <Border Grid.Column="0" Margin="-1,1">
                 <WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
             </Border>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 811ef7b1..00c47eea 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -6816,12 +6816,11 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Focusable" Value="false" />
-		<Setter Property="ClickMode" Value="Press" />
+	<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
+	</Style>
+	<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">
@@ -6900,7 +6899,7 @@
 					</hc:ToggleBlock>
 				</Border>
 			</Popup>
-			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}" />
+			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
 			<Border Grid.Column="0" Margin="-1,1">
 				<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
 			</Border>