From c7ef24a5b182ee266dbb1c3376c34a659cf59096 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Sat, 11 Jun 2022 17:25:09 +0800
Subject: [PATCH] =?UTF-8?q?:triangular=5Fflag=5Fon=5Fpost:=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=A2=E6=9D=BF=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E7=8A=B6=E6=80=81,=E6=AD=A4?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=89=A7=E8=A1=8Cgotfocus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Constant/RunTimeStatus.cs |  5 ++++
 MainWindow.xaml           | 51 +++++++++++++++++++++------------------
 MainWindow.xaml.cs        | 13 +++++++++-
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/Constant/RunTimeStatus.cs b/Constant/RunTimeStatus.cs
index 8570c7d..82df63b 100644
--- a/Constant/RunTimeStatus.cs
+++ b/Constant/RunTimeStatus.cs
@@ -30,6 +30,11 @@
         /// </summary>
         public static bool SHOW_RIGHT_BTN_MENU = false;
 
+        /// <summary>
+        /// 是否点击了面板功能按钮
+        /// </summary>
+        public static bool APP_BTN_IS_DOWN = false;
+
         /// <summary>
         /// 是否正在编辑菜单
         /// </summary>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 833185e..851bb32 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -28,6 +28,7 @@
         MouseEnter="MainWindow_MouseEnter"
         GotFocus="Window_GotFocus"
         Loaded="Window_Loaded"
+        xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility}"
         >
     
     <Window.Resources>
@@ -88,32 +89,34 @@
                         </DockPanel.Background>
                         <hc:UniformSpacingPanel Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
                             <Button Background="Transparent"
-                                BorderThickness="0"
-                                hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
-                                hc:IconElement.Height="18"
-                                hc:IconElement.Width="18"
-                                HorizontalAlignment="Right"
-                                Click="ConfigButtonClick"
-                                Initialized="SettingButton_Initialized"
-                                x:Name="SettingButton"
-                                FocusVisualStyle="{x:Null}"
-                                >
-                                <Button.ContextMenu>
-                                    <ContextMenu x:Name="SettingMenus" Width="130">
-                                        <MenuItem Header="设置" Click="ConfigMenuClick"/>
-                                        <MenuItem Header="待办" Click="BacklogMenuClick"/>
-                                    </ContextMenu>
-                                </Button.ContextMenu>
+                                    BorderThickness="0"
+                                    hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    HorizontalAlignment="Right"
+                                    Click="ConfigButtonClick"
+                                    Initialized="SettingButton_Initialized"
+                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                    x:Name="SettingButton"
+                                    FocusVisualStyle="{x:Null}"
+                                    >
+                                    <Button.ContextMenu>
+                                        <ContextMenu x:Name="SettingMenus" Width="130">
+                                            <MenuItem Header="设置" Click="ConfigMenuClick"/>
+                                            <MenuItem Header="待办" Click="BacklogMenuClick"/>
+                                        </ContextMenu>
+                                    </Button.ContextMenu>
                             </Button>
                             <Button Background="Transparent" 
-                                BorderThickness="0"
-                                hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
-                                hc:IconElement.Height="18"
-                                hc:IconElement.Width="18"
-                                HorizontalAlignment="Right"
-                                Click="CloseButtonClick"
-                                FocusVisualStyle="{x:Null}"
-                                />
+                                    BorderThickness="0"
+                                    hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    HorizontalAlignment="Right"
+                                    Click="CloseButtonClick"
+                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                    FocusVisualStyle="{x:Null}"
+                                    />
                         </hc:UniformSpacingPanel>
                     </DockPanel>
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index abdafbe..f943eaf 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -753,7 +753,8 @@ namespace GeekDesk
         {
             // 如果没有在修改菜单 并且不是右键点击了面板
             if (!RunTimeStatus.IS_MENU_EDIT
-                && !RunTimeStatus.SHOW_RIGHT_BTN_MENU)
+                && !RunTimeStatus.SHOW_RIGHT_BTN_MENU
+                && !RunTimeStatus.APP_BTN_IS_DOWN)
             {
                 if (RunTimeStatus.SHOW_MENU_PASSWORDBOX)
                 {
@@ -791,5 +792,15 @@ namespace GeekDesk
             t.Start();
         }
 
+        private void AppButton_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            //点击了面板
+            RunTimeStatus.APP_BTN_IS_DOWN = true;
+            new Thread(() =>
+            {
+                Thread.Sleep(50);
+                RunTimeStatus.APP_BTN_IS_DOWN = false;
+            }).Start();
+        }
     }
 }