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

(unsuccessful) attempt to restore window to specified virtual desktop

Browse source
This commit is contained in:
Kang Yu 2023-07-15 18:47:56 -07:00
parent 523bf1d1d3
commit c5ef467e9c
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1976,7 +1976,7 @@ namespace PersistentWindows.Common
} }
} }
if (vd.Enabled()) if (vd.Enabled() && IsTopLevelWindow(hWnd))
{ {
curDisplayMetrics.Guid = vd.GetWindowDesktopId(hWnd); curDisplayMetrics.Guid = vd.GetWindowDesktopId(hWnd);
} }
@ -2368,6 +2368,19 @@ namespace PersistentWindows.Common
moved = true; moved = true;
} }
if (restoringFromDB)
{
if (vd.Enabled() && IsTopLevelWindow(hwnd))
{
Guid curVd = vd.GetWindowDesktopId(hwnd);
if (curVd != Guid.Empty && prevDisplayMetrics.Guid != Guid.Empty)
{
if (curVd != prevDisplayMetrics.Guid)
return true;
}
}
}
if (fixZorder > 0) if (fixZorder > 0)
{ {
if (prevDisplayMetrics.IsTopMost != curDisplayMetrics.IsTopMost) if (prevDisplayMetrics.IsTopMost != curDisplayMetrics.IsTopMost)
@ -3037,6 +3050,18 @@ namespace PersistentWindows.Common
continue; continue;
} }
if (restoringFromDB)
{
if (vd.Enabled() && IsTopLevelWindow(hWnd))
{
Guid curVd = vd.GetWindowDesktopId(hWnd);
if (curVd != Guid.Empty && prevDisplayMetrics.Guid != Guid.Empty)
{
if (curVd != prevDisplayMetrics.Guid)
vd.MoveWindowToDesktop(hWnd, prevDisplayMetrics.Guid);
}
}
}
RECT rect = prevDisplayMetrics.ScreenPosition; RECT rect = prevDisplayMetrics.ScreenPosition;
WindowPlacement windowPlacement = prevDisplayMetrics.WindowPlacement; WindowPlacement windowPlacement = prevDisplayMetrics.WindowPlacement;

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

@ -62,7 +62,7 @@ namespace PersistentWindows.Common
if (hr != 0) if (hr != 0)
{ {
//Marshal.ThrowExceptionForHR(hr); //Marshal.ThrowExceptionForHR(hr);
Log.Error("GetWindowDesktopId() call failed"); //Log.Error("GetWindowDesktopId() call failed");
} }
return result; return result;