From 9cbbd6cf45317933dab9b83363107137ff33550a Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Fri, 27 May 2022 10:48:34 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=9B=BE=E6=A0=87=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=8B=BE=E8=89=B2=E5=99=A8,=20=E8=8F=9C=E5=8D=95=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Windows/GlobalColorPickerWindow.xaml.cs   | 21 ++++++++++++++-----
 MainWindow.xaml                               | 10 ++++-----
 MainWindow.xaml.cs                            | 13 ++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Control/Windows/GlobalColorPickerWindow.xaml.cs b/Control/Windows/GlobalColorPickerWindow.xaml.cs
index 5045abf..80f69ac 100644
--- a/Control/Windows/GlobalColorPickerWindow.xaml.cs
+++ b/Control/Windows/GlobalColorPickerWindow.xaml.cs
@@ -81,15 +81,25 @@ namespace GeekDesk.Control.Windows
             if (window == null || !window.Activate())
             {
                 window = new GlobalColorPickerWindow();
+                window.Opacity = 0;
+                App.DoEvents();
                 window.Show();
             }
             window.Hide();
-            GlobalColorPickerWindow thisWindow = (GlobalColorPickerWindow)window;
-            if (thisWindow.colorPickerWindow == null || !thisWindow.colorPickerWindow.Activate())
+            new Thread(() =>
             {
-                thisWindow.colorPickerWindow = new PixelColorPickerWindow(thisWindow.MyColorPicker);
-            }
-            thisWindow.colorPickerWindow.Show();
+                Thread.Sleep(200);
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    GlobalColorPickerWindow thisWindow = (GlobalColorPickerWindow)window;
+                    if (thisWindow.colorPickerWindow == null || !thisWindow.colorPickerWindow.Activate())
+                    {
+                        thisWindow.colorPickerWindow = new PixelColorPickerWindow(thisWindow.MyColorPicker);
+                    }
+                    thisWindow.colorPickerWindow.Show();
+                });
+            }).Start();
+            
         }
 
         public static void Show()
@@ -98,6 +108,7 @@ namespace GeekDesk.Control.Windows
             {
                 window = new GlobalColorPickerWindow();
             }
+            window.Opacity = 1;
             window.Show();
             Keyboard.Focus(window);
         }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 1a8c2bd..ba1da4e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -141,11 +141,9 @@
                              TextChanged="SearchBox_TextChanged"
                              />
 
-                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
 
-                    <hc:NotifyIcon Icon="/Taskbar.ico"  Click="NotifyIcon_Click" x:Name="BarIcon"
-                                   MouseRightButtonDown="BarIcon_MouseRightButtonDown"
-                                   Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
+                    <hc:NotifyIcon Icon="/Taskbar.ico" Click="NotifyIcon_Click" x:Name="BarIcon"
+                            Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
                         <hc:NotifyIcon.ContextMenu>
                             <ContextMenu Width="130" x:Name="TaskbarContextMenu">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
@@ -158,8 +156,10 @@
                                 <MenuItem Header="退出" Click="ExitApp"/>
                             </ContextMenu>
                         </hc:NotifyIcon.ContextMenu>
-
                     </hc:NotifyIcon>
+
+                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
+
                     <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
                 </Grid>
             </Border>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index a5ffd4a..f4cd8b4 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -718,20 +718,10 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void ColorPicker(object sender, RoutedEventArgs e)
         {
-            TaskbarContextMenu.Visibility = Visibility.Collapsed;
-            App.DoEvents();
+            TaskbarContextMenu.IsOpen = false;
             GlobalColorPickerWindow.CreateNoShow();
         }
 
-        /// <summary>
-        /// 防止点击拾色器后无法显示菜单的问题
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BarIcon_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            TaskbarContextMenu.Visibility = Visibility.Visible;
-        }
 
         private void Window_GotFocus(object sender, RoutedEventArgs e)
         {
@@ -742,5 +732,6 @@ namespace GeekDesk
         {
             AppWindowLostFocus();
         }
+
     }
 }