From 9f60f1be633125caac6e86b2e31a65676281fb02 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Fri, 7 Jan 2022 20:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E9=97=B4=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/Config/MotionControl.xaml    | 6 +++---
 Control/UserControls/Config/MotionControl.xaml.cs | 7 ++-----
 Thread/MouseHookThread.cs                         | 4 +++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Control/UserControls/Config/MotionControl.xaml b/Control/UserControls/Config/MotionControl.xaml
index 45bd7e4..1506704 100644
--- a/Control/UserControls/Config/MotionControl.xaml
+++ b/Control/UserControls/Config/MotionControl.xaml
@@ -41,7 +41,7 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="鼠标中间呼出" Checked="MouseMiddle_Changed" Unchecked="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}">
+                <CheckBox  Content="鼠标中间呼出" Click="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
@@ -61,7 +61,7 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Checked="MarginHide_Changed" Unchecked="MarginHide_Changed">
+                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Click="MarginHide_Changed">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
@@ -71,7 +71,7 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="主窗口动画效果" IsChecked="{Binding AppAnimation}" Checked="Animation_Checked">
+                <CheckBox  Content="主窗口动画效果" IsChecked="{Binding AppAnimation}" Click="Animation_Checked">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
diff --git a/Control/UserControls/Config/MotionControl.xaml.cs b/Control/UserControls/Config/MotionControl.xaml.cs
index 14d3761..40acd7c 100644
--- a/Control/UserControls/Config/MotionControl.xaml.cs
+++ b/Control/UserControls/Config/MotionControl.xaml.cs
@@ -253,13 +253,10 @@ namespace GeekDesk.Control.UserControls.Config
         {
             if (appConfig.MarginHide)
             {
-                MainWindow.hide.TimerSet();
+                MarginHide.StartHide();
             } else
             {
-                if (MainWindow.hide.timer != null)
-                {
-                    MainWindow.hide.TimerStop();
-                }
+                MarginHide.StopHide();
             }
         }
 
diff --git a/Thread/MouseHookThread.cs b/Thread/MouseHookThread.cs
index 56eb57e..59d522b 100644
--- a/Thread/MouseHookThread.cs
+++ b/Thread/MouseHookThread.cs
@@ -24,6 +24,7 @@ namespace GeekDesk.Thread
         public static void MiddleHook()
         {
             //使用dispatcher来单独监听UI线程  防止程序卡顿
+            if (dispatcher != null) return;
             dispatcher = DispatcherBuild.Build();
             m_GlobalHook = Hook.GlobalEvents();
             dispatcher.Invoke((Action)(() =>
@@ -38,6 +39,7 @@ namespace GeekDesk.Thread
             {
                 m_GlobalHook.MouseDownExt -= M_GlobalHook_MouseDownExt;
                 m_GlobalHook.Dispose();
+                m_GlobalHook = null;
                 dispatcher.InvokeShutdown();
                 dispatcher = null;
             }
@@ -60,7 +62,7 @@ namespace GeekDesk.Thread
                     {
                         if (MainWindow.mainWindow.Visibility == Visibility.Collapsed 
                         || MainWindow.mainWindow.Opacity == 0 
-                        || MarginHide.isHide)
+                        || MarginHide.IS_HIDE)
                         {
                             MainWindow.ShowApp();
                         }