Merge remote-tracking branch 'origin/zhangxueyang' into zyy

解决冲突
# Conflicts:
#	XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -104,7 +104,7 @@ namespace XHWK.WKTool
                 Thread.Sleep(100);
                 Dispatcher.Invoke(() =>
                 {
-                    Owner = APP.W_PracticeWindow;
+                    //Owner = APP.W_PracticeWindow;
                     Topmost = true;
                 });
             }))).Start();
@@ -672,6 +672,7 @@ namespace XHWK.WKTool
             float DIPY = graphics.DpiY;
             APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width + 10;
             gridToobar.Visibility = Visibility.Visible;
+            APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
         #endregion
 
@@ -738,21 +739,23 @@ namespace XHWK.WKTool
                             //APP.W_PracticeWindow.InitPen();
                             //APP.W_PracticeWindow.InitTQLPPen();
                             APP.W_PracticeWindow.Initialize();// imagePath);
-                            APP.W_PracticeWindow.Focus();
                             flg = 11;
                             APP.W_PracticeWindow.Blue();
                             APP.W_PracticeWindow.Show();
+                            APP.W_PracticeWindow.Topmost = true;
+                            APP.W_PracticeWindow.Focus();
                         });
+                  
+              
                         new Thread(new ThreadStart(new Action(() =>
                         {
                             Dispatcher.Invoke(() =>
                             {
-                                APP.W_PracticeWindow.Topmost = true;
+                                APP.W_PracticeWindow.Topmost = false;
                             });
-                            Thread.Sleep(100);
+                            Thread.Sleep(500);
                             Dispatcher.Invoke(() =>
                             {
-                                APP.W_PracticeWindow.Topmost = false;
                                 //Owner = APP.W_PracticeWindow;
                                 Topmost = true;
                             });
@@ -856,7 +859,7 @@ namespace XHWK.WKTool
                         Thread.Sleep(100);
                         Dispatcher.Invoke(() =>
                         {
-                            Owner = APP.W_PracticeWindow;
+                            //Owner = APP.W_PracticeWindow;
                             Topmost = true;
                         });
                     }))).Start();
@@ -1164,7 +1167,7 @@ namespace XHWK.WKTool
                         Thread.Sleep(100);
                         Dispatcher.Invoke(() =>
                         {
-                            Owner = APP.W_PracticeWindow;
+                            //Owner = APP.W_PracticeWindow;
                             Topmost = true;
                         });
                     }))).Start();