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

match new window with killed one in LIFO style

Browse source
This commit is contained in:
Kang Yu 2025-04-30 19:47:32 -07:00
parent 5f666b20d1
commit f66dc3afd8
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1493,6 +1493,8 @@ namespace PersistentWindows.Common
int similar_pos_cnt = 0; int similar_pos_cnt = 0;
int diff_size = int.MaxValue; int diff_size = int.MaxValue;
IntPtr similar_pos_hid = IntPtr.Zero; IntPtr similar_pos_hid = IntPtr.Zero;
DateTime last_killed_time = new DateTime(0);
IntPtr last_killed_hid = IntPtr.Zero;
var deadAppPos = deadApps[curDisplayKey]; var deadAppPos = deadApps[curDisplayKey];
lock(captureLock) lock(captureLock)
@ -1541,6 +1543,12 @@ namespace PersistentWindows.Common
similar_pos_cnt++; similar_pos_cnt++;
similar_pos_hid = kid; similar_pos_hid = kid;
} }
if (appPos.CaptureTime > last_killed_time)
{
last_killed_time = appPos.CaptureTime;
last_killed_hid = kid;
}
} }
if (pos_match_cnt == 1) if (pos_match_cnt == 1)
@ -1564,6 +1572,7 @@ namespace PersistentWindows.Common
int proc_name_match_cnt = 0; int proc_name_match_cnt = 0;
int class_name_match_cnt = 0; int class_name_match_cnt = 0;
int class_name_mismatch_cnt = 0;
foreach(var h in monitorApplications[curDisplayKey].Keys) foreach(var h in monitorApplications[curDisplayKey].Keys)
{ {
foreach (var dm in monitorApplications[curDisplayKey][h]) foreach (var dm in monitorApplications[curDisplayKey][h])
@ -1577,21 +1586,27 @@ namespace PersistentWindows.Common
proc_name_match_cnt++; proc_name_match_cnt++;
if (dm.ClassName == className) if (dm.ClassName == className)
class_name_match_cnt++; class_name_match_cnt++;
else
class_name_mismatch_cnt++;
} }
break; break;
} }
} }
//force match if hwnd is the first live window of the app //force match last killed pos if hwnd is the first live window of the app
if (proc_name_match_cnt == 0) if (proc_name_match_cnt == 0)
return similar_pos_hid; return last_killed_hid;
//force match most closest pos if hwnd is the first sub window of the app
if (proc_name_match_cnt == 1 && class_name_match_cnt == 0) if (proc_name_match_cnt == 1 && class_name_match_cnt == 0)
return similar_pos_hid; return similar_pos_hid;
//force match if hwnd-like window has multiple instantiations but has only one top-level matching candidate //force match if hwnd-like window has multiple instantiations but has only one top-level matching candidate
if (similar_pos_cnt == 1 && class_name_match_cnt > 0) if (similar_pos_cnt == 1 && class_name_match_cnt > 0)
return similar_pos_hid; return similar_pos_hid;
if (class_name_match_cnt > 0 && class_name_mismatch_cnt == 0)
return last_killed_hid;
} }
return IntPtr.Zero; return IntPtr.Zero;