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

improve accuracy of matching killed window based on position similarity

Browse source
This commit is contained in:
Kang Yu 2025-04-25 23:39:44 -07:00
parent fb5f538b88
commit e4be317e77
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1470,7 +1470,11 @@ namespace PersistentWindows.Common
{ {
int title_match_cnt = 0; int title_match_cnt = 0;
IntPtr title_match_hid = IntPtr.Zero; IntPtr title_match_hid = IntPtr.Zero;
int pos_match_cnt = 0;
IntPtr pos_match_hid = IntPtr.Zero; IntPtr pos_match_hid = IntPtr.Zero;
int similar_pos_cnt = 0;
int diff_size = 1000;
IntPtr similar_pos_hid = IntPtr.Zero;
var deadAppPos = deadApps[curDisplayKey]; var deadAppPos = deadApps[curDisplayKey];
lock(captureLock) lock(captureLock)
@ -1501,15 +1505,32 @@ namespace PersistentWindows.Common
title_match_hid = kid; title_match_hid = kid;
++title_match_cnt; ++title_match_cnt;
} }
else if (rect.Equals(r))
if (rect.Equals(r))
{
pos_match_cnt++;
pos_match_hid = kid; pos_match_hid = kid;
}
if (r.Diff(rect) < diff_size)
{
diff_size = r.Diff(rect);
similar_pos_cnt++;
similar_pos_hid = kid;
}
} }
if (title_match_cnt == 1) if (title_match_cnt == 1)
return title_match_hid; return title_match_hid;
if (pos_match_hid != IntPtr.Zero) if (pos_match_cnt == 1)
return pos_match_hid; return pos_match_hid;
if (similar_pos_cnt == 1 || diff_size < 200)
{
Log.Event($"found similar match with pos diff of {diff_size}");
return similar_pos_hid;
}
} }
return IntPtr.Zero; return IntPtr.Zero;
@ -2044,12 +2065,14 @@ namespace PersistentWindows.Common
if (freezeCapture || !monitorApplications.ContainsKey(curDisplayKey)) if (freezeCapture || !monitorApplications.ContainsKey(curDisplayKey))
return; return;
/*
//try to inherit from killed window database //try to inherit from killed window database
if (FindMatchingKilledWindow(hwnd) != IntPtr.Zero) if (FindMatchingKilledWindow(hwnd) != IntPtr.Zero)
{ {
userMove = true;
StartCaptureTimer(UserMoveLatency / 2);
} }
*/
userMove = true;
StartCaptureTimer(UserMoveLatency * 4);
} }
break; break;

5
Ninjacrab.PersistentWindows.Solution/Common/WinApiBridge/WindowsPosition.cs
View file

@ -61,5 +61,10 @@ namespace PersistentWindows.Common.WinApiBridge
{ {
return string.Format("({0}, {1}), {2} x {3}", Left, Top, Width, Height); return string.Format("({0}, {1}), {2} x {3}", Left, Top, Width, Height);
} }
public int Diff(RECT r)
{
return Math.Abs(Left - r.Left) + Math.Abs(Right - r.Right) + Math.Abs(Top - r.Top) + Math.Abs(Bottom - r.Bottom);
}
} }
} }