Minor

Author: rampaa

JL.Windows/GUI/MainWindow.xaml.cs

@@ -1562,6 +1562,11 @@ private void Window_MouseLeave(object sender, MouseEventArgs e)
 
     private void Window_MouseEnter(object sender, MouseEventArgs e)
     {
+        if (FirstPopupWindow.IsVisible)
+        {
+            return;
+        }
+
         ConfigManager configManager = ConfigManager.Instance;
         if (configManager.TextOnlyVisibleOnHover)
         {
@@ -1573,8 +1578,7 @@ private void Window_MouseEnter(object sender, MouseEventArgs e)
             Background.Opacity = OpacitySlider.Value / 100;
         }
 
-        if (!FirstPopupWindow.IsVisible
-            && configManager is { Focusable: true, MainWindowFocusOnHover: true })
+        if (configManager is { Focusable: true, MainWindowFocusOnHover: true })
         {
             if (configManager.RestoreFocusToPreviouslyActiveWindow)
             {

JL.Windows/GUI/PopupWindow.xaml.cs

@@ -298,13 +298,16 @@ public Task LookupOnCharPosition(TextBox textBox, int charPosition, bool enableM
                 if (configManager.RestoreFocusToPreviouslyActiveWindow && isFirstPopupWindow)
                 {
                     nint previousWindowHandle = WinApi.GetActiveWindowHandle();
-                    if (previousWindowHandle != mainWindow.WindowHandle)
+                    if (previousWindowHandle != mainWindow.WindowHandle && previousWindowHandle != WindowHandle)
                     {
                         WindowsUtils.LastActiveWindowHandle = previousWindowHandle;
                     }
                 }
 
-                _ = Activate();
+                if (!Activate())
+                {
+                    WinApi.StealFocus(WindowHandle);
+                }
             }
 
             _ = Focus();
@@ -396,7 +399,20 @@ public Task LookupOnSelect(TextBox textBox)
 
             if (configManager.Focusable)
             {
-                _ = Activate();
+                MainWindow mainWindow = MainWindow.Instance;
+                if (configManager.RestoreFocusToPreviouslyActiveWindow && this == mainWindow.FirstPopupWindow)
+                {
+                    nint previousWindowHandle = WinApi.GetActiveWindowHandle();
+                    if (previousWindowHandle != mainWindow.WindowHandle && previousWindowHandle != WindowHandle)
+                    {
+                        WindowsUtils.LastActiveWindowHandle = previousWindowHandle;
+                    }
+                }
+
+                if (!Activate())
+                {
+                    WinApi.StealFocus(WindowHandle);
+                }
             }
 
             _ = Focus();
@@ -1545,7 +1561,19 @@ public Task HandleHotKey(KeyGesture keyGesture)
 
             if (configManager.Focusable)
             {
-                _ = Activate();
+                if (configManager.RestoreFocusToPreviouslyActiveWindow && this == mainWindow.FirstPopupWindow)
+                {
+                    nint previousWindowHandle = WinApi.GetActiveWindowHandle();
+                    if (previousWindowHandle != mainWindow.WindowHandle && previousWindowHandle != WindowHandle)
+                    {
+                        WindowsUtils.LastActiveWindowHandle = previousWindowHandle;
+                    }
+                }
+
+                if (!Activate())
+                {
+                    WinApi.StealFocus(WindowHandle);
+                }
             }
 
             _ = Focus();
@@ -2332,7 +2360,20 @@ public void ShowMiningModeResults()
 
         if (configManager.Focusable)
         {
-            _ = Activate();
+            MainWindow mainWindow = MainWindow.Instance;
+            if (configManager.RestoreFocusToPreviouslyActiveWindow && this == mainWindow.FirstPopupWindow)
+            {
+                nint previousWindowHandle = WinApi.GetActiveWindowHandle();
+                if (previousWindowHandle != mainWindow.WindowHandle && previousWindowHandle != WindowHandle)
+                {
+                    WindowsUtils.LastActiveWindowHandle = previousWindowHandle;
+                }
+            }
+
+            if (!Activate())
+            {
+                WinApi.StealFocus(WindowHandle);
+            }
         }
 
         _ = Focus();

JL.Windows/GUI/PreferencesWindow.xaml

@@ -132,7 +132,7 @@
                                        Cursor="Help" TextWrapping="Wrap" VerticalAlignment="Center"
                                        ToolTip="Restores focus to the non-JL window that was previously active if focus was automatically taken by the "Focus on hover" or "Focus on lookup" option,
                                        
when no popup is open and the mouse is no longer over the main window.
-                                       
Note that JL may need to attach itself to another program's thread to do this, which could be seen as an intrusive action.
+                                       
Note that JL may need to attach itself to currently activated window's thread to do this, which could be seen as an intrusive action.
                                        
Keep this in mind before enabling this option." />
                             <CheckBox x:Name="RestoreFocusToPreviouslyActiveWindowCheckBox"  HorizontalAlignment="Right" />
                         </DockPanel>
@@ -483,7 +483,7 @@
                                        TextWrapping="Wrap" VerticalAlignment="Center"
                                        Cursor="Help"
                                        ToolTip="Attempts to steal focus from the currently active window on mouse hover.
-                                       &#10;Note that JL may need to attach itself to another program's thread to do this, which could be seen as an intrusive action.
+                                       &#10;Note that JL may need to attach itself to currently activated window's thread to do this, which could be seen as an intrusive action.
                                        &#10;Keep that in mind before enabling this option.
                                        &#10;If &quot;Focusable&quot; is set to false, this option will have no effect." />
                             <CheckBox x:Name="MainWindowFocusOnHoverCheckBox" HorizontalAlignment="Right" />
@@ -760,6 +760,8 @@
                                        Style="{StaticResource TextBlockDefault}"
                                        Cursor="Help"
                                        ToolTip="Attempt to set focus on the popup window when you mouse over text.
+                                       &#10;Note that JL may need to attach itself to currently activated window's thread to do this, which could be seen as an intrusive action.
+                                       &#10;Keep this in mind before enabling this option.
                                        &#10;If Focusable is set to false, this option will have no effect." />
                             <CheckBox x:Name="PopupFocusOnLookupCheckBox"  HorizontalAlignment="Right" />
                         </DockPanel>

JL.Windows/WinApi.cs

@@ -367,19 +367,23 @@ public static void GiveFocusToWindow(nint windowHandle)
         {
             uint currentThreadId = GetCurrentThreadId();
             uint foregroundThread = GetWindowThreadProcessId(windowHandle, out _);
-            _ = AttachThreadInput(currentThreadId, foregroundThread, true);
-            _ = SetForegroundWindow(windowHandle);
-            _ = AttachThreadInput(currentThreadId, foregroundThread, false);
+            if (AttachThreadInput(currentThreadId, foregroundThread, true))
+            {
+                _ = SetForegroundWindow(windowHandle);
+                _ = AttachThreadInput(currentThreadId, foregroundThread, false);
+            }
         }
     }
 
     public static void StealFocus(nint windowHandle)
     {
         uint currentThreadId = GetCurrentThreadId();
         uint foregroundThread = GetWindowThreadProcessId(GetForegroundWindow(), out _);
-        _ = AttachThreadInput(currentThreadId, foregroundThread, true);
-        _ = SetForegroundWindow(windowHandle);
-        _ = AttachThreadInput(currentThreadId, foregroundThread, false);
+        if (AttachThreadInput(currentThreadId, foregroundThread, true))
+        {
+            _ = SetForegroundWindow(windowHandle);
+            _ = AttachThreadInput(currentThreadId, foregroundThread, false);
+        }
     }
 
     private nint WndProc(nint hwnd, int msg, nint wParam, nint lParam, ref bool handled)