mirrors/PersistentWindows
1
0
Fork 0
mirror of https://github.com/kangyu-california/PersistentWindows.git synced 2025-05-12 05:25:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid webpage activation disturb auto restore

Browse source
This commit is contained in:
Kang Yu 2024-08-09 21:02:40 -07:00
parent e7b52a035c
commit bed63a11f4
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ninjacrab.PersistentWindows.Solution/Common/HotKeyWindow.cs
View file

@ -30,6 +30,7 @@ namespace PersistentWindows.Common
private bool active = false; private bool active = false;
private static bool tiny = false; private static bool tiny = false;
private static bool browserWindowActivated = false; private static bool browserWindowActivated = false;
private static bool restoring = false;
private int origWidth; private int origWidth;
private int origHeight; private int origHeight;
private int mouseOffset = 0; //mouse dithering to workaround mouse location mis-update issue in rdp session private int mouseOffset = 0; //mouse dithering to workaround mouse location mis-update issue in rdp session
@ -635,9 +636,10 @@ namespace PersistentWindows.Common
} }
public static void BrowserActivate(IntPtr hwnd, bool is_browser_window = true) public static void BrowserActivate(IntPtr hwnd, bool is_browser_window = true, bool in_restore = false)
{ {
browserWindowActivated = is_browser_window; browserWindowActivated = is_browser_window;
restoring = in_restore;
if (!tiny && !User32.IsWindowVisible(commanderWnd)) if (!tiny && !User32.IsWindowVisible(commanderWnd))
return; return;
@ -822,12 +824,17 @@ namespace PersistentWindows.Common
IntPtr fgwnd = GetForegroundWindow(); IntPtr fgwnd = GetForegroundWindow();
if (!PersistentWindowProcessor.IsBrowserWindow(fgwnd)) if (!PersistentWindowProcessor.IsBrowserWindow(fgwnd))
{ {
if (browserWindowActivated) if (browserWindowActivated || restoring)
StartAliveTimer(6, 1000); StartAliveTimer(6, 1000);
else else
Visible = false; Visible = false;
return; return;
} }
else if (restoring)
{
StartAliveTimer(6, 1000);
return;
}
RECT rect = new RECT(); RECT rect = new RECT();
User32.GetWindowRect(fgwnd, ref rect); User32.GetWindowRect(fgwnd, ref rect);

2
Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
View file

@ -1321,7 +1321,7 @@ namespace PersistentWindows.Common
{ {
IntPtr topHwnd = User32.GetAncestor(hwnd, User32.GetAncestorRoot); IntPtr topHwnd = User32.GetAncestor(hwnd, User32.GetAncestorRoot);
if (hwnd == topHwnd) if (hwnd == topHwnd)
HotKeyWindow.BrowserActivate(topHwnd); HotKeyWindow.BrowserActivate(topHwnd, in_restore : restoringFromMem);
} }
else else
HotKeyWindow.BrowserActivate(hwnd, false); HotKeyWindow.BrowserActivate(hwnd, false);