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

refactor new function RecallLastKilledPosition()

Browse source
This commit is contained in:
Kang Yu 2023-09-14 12:06:03 -07:00
parent 6526a119eb
commit 42533389f2
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ninjacrab.PersistentWindows.Solution/Common/Models/ApplicationDisplayMetrics.cs
View file

@ -8,6 +8,7 @@ namespace PersistentWindows.Common.Models
public class DeadAppPosition
{
public string ClassName { get; set; }
public string Title { get; set; }
public string ProcessPath { get; set; }
public RECT ScreenPosition { get; set; }
}

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

@ -855,15 +855,8 @@ namespace PersistentWindows.Common
return offscreen;
}
private void FixOffScreenWindow(IntPtr hwnd)
private bool RecallLastKilledPosition(IntPtr hwnd)
{
var displayKey = GetDisplayKey();
if (!normalSessions.Contains(displayKey))
{
Log.Error("Avoid recover invisible window \"{0}\"", GetWindowTitle(hwnd));
return;
}
if (deadApps.ContainsKey(curDisplayKey))
{
var deadAppPos = deadApps[curDisplayKey];
@ -873,33 +866,44 @@ namespace PersistentWindows.Common
uint processId = 0;
uint threadId = User32.GetWindowThreadProcessId(hwnd, out processId);
string procPath = GetProcExePath(processId);
string title = GetWindowTitle(hwnd);
int idx = deadAppPos.Count;
bool found = false;
foreach (var appPos in deadAppPos.Reverse<DeadAppPosition>())
{
--idx;
if (!className.Equals(appPos.ClassName))
continue;
if (!title.Equals(appPos.Title))
continue;
if (!procPath.Equals(appPos.ProcessPath))
continue;
// found match
RECT r = appPos.ScreenPosition;
User32.MoveWindow(hwnd, r.Left, r.Top, r.Width, r.Height, true);
Log.Error("Recover invisible window \"{0}\"", GetWindowTitle(hwnd));
found = true;
break;
}
if (found)
{
Log.Error("Recover last close location\"{0}\"", GetWindowTitle(hwnd));
deadApps[curDisplayKey].RemoveAt(idx);
return;
return true;
}
}
}
return false;
}
private void FixOffScreenWindow(IntPtr hwnd)
{
var displayKey = GetDisplayKey();
if (!normalSessions.Contains(displayKey))
{
Log.Error("Avoid recover invisible window \"{0}\"", GetWindowTitle(hwnd));
return;
}
if (RecallLastKilledPosition(hwnd))
return;
RECT rect = new RECT();
User32.GetWindowRect(hwnd, ref rect);
@ -1200,6 +1204,7 @@ namespace PersistentWindows.Common
var appPos = new DeadAppPosition();
var lastMetric = monitorApplications[key][hwnd].Last();
appPos.ClassName = lastMetric.ClassName;
appPos.Title = lastMetric.Title;
appPos.ScreenPosition = lastMetric.ScreenPosition;
string procPath = GetProcExePath(lastMetric.ProcessId);
appPos.ProcessPath = procPath;