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 @@
///
public static bool SHOW_RIGHT_BTN_MENU = false;
+ ///
+ /// 是否点击了面板功能按钮
+ ///
+ public static bool APP_BTN_IS_DOWN = false;
+
///
/// 是否正在编辑菜单
///
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}"
>
@@ -88,32 +89,34 @@
+ 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}"
+ />
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();
+ }
}
}