Browse Source

去掉子层级,修改批注层级。

tags/录制修改前
zhangxueyang 3 years ago
parent
commit
260a91efa5
1 changed files with 23 additions and 13 deletions
  1. 23
    13
      XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

+ 23
- 13
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

104
                 Thread.Sleep(100);
104
                 Thread.Sleep(100);
105
                 Dispatcher.Invoke(() =>
105
                 Dispatcher.Invoke(() =>
106
                 {
106
                 {
107
-                    Owner = APP.W_PracticeWindow;
107
+                    //Owner = APP.W_PracticeWindow;
108
                     Topmost = true;
108
                     Topmost = true;
109
                 });
109
                 });
110
             }))).Start();
110
             }))).Start();
605
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
605
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
606
             }
606
             }
607
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
607
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
608
-            APP.W_XHMicroLessonSystemWindow.InitPen(); 
608
+            APP.W_XHMicroLessonSystemWindow.InitPen();
609
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
609
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
610
             APP.W_XHMicroLessonSystemWindow.Show();
610
             APP.W_XHMicroLessonSystemWindow.Show();
611
             if (!IsFirstRS)
611
             if (!IsFirstRS)
672
             float DIPY = graphics.DpiY;
672
             float DIPY = graphics.DpiY;
673
             APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width + 10;
673
             APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width + 10;
674
             gridToobar.Visibility = Visibility.Visible;
674
             gridToobar.Visibility = Visibility.Visible;
675
+            APP.W_ScreenRecordingToolbarWindow.Topmost = true;
675
         }
676
         }
676
         #endregion
677
         #endregion
677
 
678
 
733
                                     Left = 0,
734
                                     Left = 0,
734
                                     Top = 0
735
                                     Top = 0
735
                                 };
736
                                 };
736
-                            //practiceWin.Owner = this;
737
-                        }
738
-                        //APP.W_PracticeWindow.InitPen();
739
-                        //APP.W_PracticeWindow.InitTQLPPen();
740
-                        APP.W_PracticeWindow.Initialize();// imagePath);
741
-                        flg = 11;
737
+                                //practiceWin.Owner = this;
738
+                            }
739
+                            //APP.W_PracticeWindow.InitPen();
740
+                            //APP.W_PracticeWindow.InitTQLPPen();
741
+                            APP.W_PracticeWindow.Initialize();// imagePath);
742
+                            flg = 11;
743
+                            
742
                             APP.W_PracticeWindow.Blue();
744
                             APP.W_PracticeWindow.Blue();
743
                             APP.W_PracticeWindow.Show();
745
                             APP.W_PracticeWindow.Show();
746
+                            APP.W_PracticeWindow.Topmost = true;
747
+                            APP.W_PracticeWindow.Focus();
744
                         });
748
                         });
749
+                  
750
+              
745
                         new Thread(new ThreadStart(new Action(() =>
751
                         new Thread(new ThreadStart(new Action(() =>
746
                         {
752
                         {
747
-                            Thread.Sleep(100);
748
                             Dispatcher.Invoke(() =>
753
                             Dispatcher.Invoke(() =>
749
                             {
754
                             {
750
-                                Owner = APP.W_PracticeWindow;
755
+                                APP.W_PracticeWindow.Topmost = false;
756
+                            });
757
+                            Thread.Sleep(500);
758
+                            Dispatcher.Invoke(() =>
759
+                            {
760
+                                //Owner = APP.W_PracticeWindow;
751
                                 Topmost = true;
761
                                 Topmost = true;
752
                             });
762
                             });
753
                         }))).Start();
763
                         }))).Start();
850
                         Thread.Sleep(100);
860
                         Thread.Sleep(100);
851
                         Dispatcher.Invoke(() =>
861
                         Dispatcher.Invoke(() =>
852
                         {
862
                         {
853
-                            Owner = APP.W_PracticeWindow;
863
+                            //Owner = APP.W_PracticeWindow;
854
                             Topmost = true;
864
                             Topmost = true;
855
                         });
865
                         });
856
                     }))).Start();
866
                     }))).Start();
1158
                         Thread.Sleep(100);
1168
                         Thread.Sleep(100);
1159
                         Dispatcher.Invoke(() =>
1169
                         Dispatcher.Invoke(() =>
1160
                         {
1170
                         {
1161
-                            Owner = APP.W_PracticeWindow;
1171
+                            //Owner = APP.W_PracticeWindow;
1162
                             Topmost = true;
1172
                             Topmost = true;
1163
                         });
1173
                         });
1164
                     }))).Start();
1174
                     }))).Start();
1366
 
1376
 
1367
         private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
1377
         private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
1368
         {
1378
         {
1369
-            if(BtnRecordingScreen.ToolTip.ToString().Equals ("暂停")&& gridToobar.Visibility == Visibility.Visible)
1379
+            if (BtnRecordingScreen.ToolTip.ToString().Equals("暂停") && gridToobar.Visibility == Visibility.Visible)
1370
             {
1380
             {
1371
                 if (APP.IsHideSRTool)
1381
                 if (APP.IsHideSRTool)
1372
                 {
1382
                 {

Loading…
Cancel
Save