修复开启鼠标穿透后抢占焦点的问题

Planshit · Apr 29, 2020 · d2cc86a · d2cc86a
1 parent 9149995
commit d2cc86a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Local/Project1.UI/Controls/Project1UIWindow.cs b/src/Local/Project1.UI/Controls/Project1UIWindow.cs
@@ -267,10 +267,6 @@ public Project1UIWindow()
             var intPtr = new WindowInteropHelper(this).Handle;//获取当前窗口的句柄
             var screen = System.Windows.Forms.Screen.FromHandle(intPtr);//获取当前屏幕
             ScreenArea = screen.Bounds;
-
-            //如果开启了鼠标穿透则不抢占焦点
-            ShowActivated = !IsThruWindow;
-
         }
 
         ///// <summary>
@@ -749,6 +745,8 @@ private void CompletedAction(CompletedActionType completedAction)
                     Hide();
                     break;
                 case CompletedActionType.Show:
+                    //如果开启了鼠标穿透则不抢占焦点
+                    ShowActivated = !IsThruWindow;
                     Show();
                     break;
             }

diff --git a/src/Local/ProjectEye/ViewModels/TipViewModel.cs b/src/Local/ProjectEye/ViewModels/TipViewModel.cs
@@ -97,7 +97,10 @@ private void TipViewModel_ChangedEvent()
         private void TipViewModel_OnWShow(object sender, EventArgs e)
         {
             UpdateVariable();
-            WindowInstance.Focus();
+            if (!config.options.Style.IsThruTipWindow)
+            {
+                WindowInstance.Focus();
+            }
             HandleAutoAction();
         }