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

relax class name and position match when inherit killed window

Browse source
This commit is contained in:
Kang Yu 2025-04-27 21:14:09 -07:00
parent d36bf0c56c
commit 1a5d9442d2
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,8 @@ namespace PersistentWindows.Common
private const int MaxHistoryQueueLength = 41; // ideally bigger than MaxSnapshots + 2 private const int MaxHistoryQueueLength = 41; // ideally bigger than MaxSnapshots + 2
private const int PauseRestoreTaskbar = 3500; //cursor idle time before dragging taskbar private const int PauseRestoreTaskbar = 3500; //cursor idle time before dragging taskbar
private const int MinClassNamePrefix = 8; //allow partial class name matching during inheritance
private const int MaxDiffPos = 1000; //allow matching to window of different position
private bool initialized = false; private bool initialized = false;
@ -1437,6 +1439,18 @@ namespace PersistentWindows.Common
return r; return r;
} }
int LenCommonPrefix(string a, string b)
{
int len = Math.Min(a.Length, b.Length);
int r;
for (r = 0; r < len; ++r)
{
if (a[r] != b[r])
break;
}
return r;
}
private IntPtr FindMatchingKilledWindow(IntPtr hwnd) private IntPtr FindMatchingKilledWindow(IntPtr hwnd)
{ {
if (!deadApps.ContainsKey(curDisplayKey)) if (!deadApps.ContainsKey(curDisplayKey))
@ -1473,7 +1487,7 @@ namespace PersistentWindows.Common
int pos_match_cnt = 0; int pos_match_cnt = 0;
IntPtr pos_match_hid = IntPtr.Zero; IntPtr pos_match_hid = IntPtr.Zero;
int similar_pos_cnt = 0; int similar_pos_cnt = 0;
int diff_size = 1000; int diff_size = int.MaxValue;
IntPtr similar_pos_hid = IntPtr.Zero; IntPtr similar_pos_hid = IntPtr.Zero;
var deadAppPos = deadApps[curDisplayKey]; var deadAppPos = deadApps[curDisplayKey];
@ -1482,11 +1496,17 @@ namespace PersistentWindows.Common
{ {
var appPos = deadAppPos[kid].Last<ApplicationDisplayMetrics>(); var appPos = deadAppPos[kid].Last<ApplicationDisplayMetrics>();
if (!className.Equals(appPos.ClassName))
continue;
if (!procName.Equals(appPos.ProcessName)) if (!procName.Equals(appPos.ProcessName))
continue; continue;
if (!className.Equals(appPos.ClassName))
{
if (className.Length != appPos.ClassName.Length)
continue;
if (LenCommonPrefix(className, appPos.ClassName) < MinClassNamePrefix)
continue;
}
if (IsMinimized(hwnd) != appPos.IsMinimized) if (IsMinimized(hwnd) != appPos.IsMinimized)
continue; continue;
if (User32.IsWindowVisible(hwnd) == appPos.IsInvisible) if (User32.IsWindowVisible(hwnd) == appPos.IsInvisible)
@ -1526,7 +1546,7 @@ namespace PersistentWindows.Common
if (pos_match_cnt == 1) if (pos_match_cnt == 1)
return pos_match_hid; return pos_match_hid;
if (similar_pos_cnt == 1 || diff_size < 200) if (similar_pos_cnt == 1 || diff_size < MaxDiffPos)
{ {
Log.Event($"found similar match with pos diff of {diff_size}"); Log.Event($"found similar match with pos diff of {diff_size}");
return similar_pos_hid; return similar_pos_hid;