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

convert VirtualDesktop apis to static

Browse source
This commit is contained in:
Kang Yu 2024-03-24 18:29:32 -07:00
parent 3472349519
commit 2ad4e74e09
2 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1505,12 +1505,10 @@ namespace PersistentWindows.Common
{
case User32Events.EVENT_SYSTEM_FOREGROUND:
{
if (vd.Enabled())
{
var cur_vdi = vd.GetWindowDesktopId(hwnd);
if (cur_vdi != Guid.Empty)
curVirtualDesktop = cur_vdi;
}
var cur_vdi = VirtualDesktop.GetWindowDesktopId(hwnd);
if (cur_vdi != Guid.Empty)
curVirtualDesktop = cur_vdi;
if (restoringFromDB)
{
// immediately capture new window
@ -2292,9 +2290,9 @@ namespace PersistentWindows.Common
}
}
if (vd.Enabled() && IsTopLevelWindow(hWnd))
if (IsTopLevelWindow(hWnd))
{
curDisplayMetrics.Guid = vd.GetWindowDesktopId(hWnd);
curDisplayMetrics.Guid = VirtualDesktop.GetWindowDesktopId(hWnd);
}
if (curDisplayMetrics.ClassName.Equals("CabinetWClass"))
@ -2680,9 +2678,9 @@ namespace PersistentWindows.Common
if (restoringFromDB)
{
if (vd.Enabled() && IsTopLevelWindow(hwnd))
if (IsTopLevelWindow(hwnd))
{
Guid curVd = vd.GetWindowDesktopId(hwnd);
Guid curVd = VirtualDesktop.GetWindowDesktopId(hwnd);
if (curVd != Guid.Empty && prevDisplayMetrics.Guid != Guid.Empty)
{
if (curVd != prevDisplayMetrics.Guid)
@ -3732,7 +3730,7 @@ namespace PersistentWindows.Common
// launch missing process according to db
var list = new List<ApplicationDisplayMetrics>(db.FindAll());
if (vd.Enabled())
if (VirtualDesktop.Enabled())
{
//sort windows by virtual desktop
list.Sort(delegate (ApplicationDisplayMetrics adm1, ApplicationDisplayMetrics adm2)
@ -3766,7 +3764,7 @@ namespace PersistentWindows.Common
var runProcessDlg = new LaunchProcess(curDisplayMetrics.ProcessName, curDisplayMetrics.Title);
runProcessDlg.TopMost = true;
runProcessDlg.Icon = icon;
if (vd.Enabled() && curDisplayMetrics.Guid != Guid.Empty && curDisplayMetrics.Guid != curVirtualDesktop)
if (VirtualDesktop.Enabled() && curDisplayMetrics.Guid != Guid.Empty && curDisplayMetrics.Guid != curVirtualDesktop)
{
System.Windows.Forms.MessageBox.Show("Switch to another virtual desktop to restore windows",
System.Windows.Forms.Application.ProductName,
@ -3775,7 +3773,7 @@ namespace PersistentWindows.Common
System.Windows.Forms.MessageBoxDefaultButton.Button1,
System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly
);
vd.MoveWindowToDesktop(runProcessDlg.Handle, curDisplayMetrics.Guid);
VirtualDesktop.MoveWindowToDesktop(runProcessDlg.Handle, curDisplayMetrics.Guid);
}
runProcessDlg.ShowDialog();

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

@ -25,15 +25,13 @@ namespace PersistentWindows.Common
public class VirtualDesktop
{
private IVirtualDesktopManager _manager = null;
private static IVirtualDesktopManager _static_manager = null;
public VirtualDesktop()
{
try
{
_manager = (IVirtualDesktopManager)new CVirtualDesktopManager();
_static_manager = _manager;
_static_manager = (IVirtualDesktopManager)new CVirtualDesktopManager();
}
catch
{
@ -41,14 +39,14 @@ namespace PersistentWindows.Common
}
}
public bool Enabled()
public static bool Enabled()
{
return _manager != null;
return _static_manager != null;
}
public static bool IsWindowOnCurrentVirtualDesktop(IntPtr TopLevelWindow)
{
if (_static_manager == null)
if (!Enabled())
return true;
int result = 1;
@ -62,9 +60,12 @@ namespace PersistentWindows.Common
return result != 0;
}
public Guid GetWindowDesktopId(IntPtr TopLevelWindow)
public static Guid GetWindowDesktopId(IntPtr TopLevelWindow)
{
int hr = _manager.GetWindowDesktopId(TopLevelWindow, out Guid result);
if (!Enabled())
return Guid.Empty;
int hr = _static_manager.GetWindowDesktopId(TopLevelWindow, out Guid result);
if (hr != 0)
{
//Marshal.ThrowExceptionForHR(hr);
@ -74,12 +75,12 @@ namespace PersistentWindows.Common
return result;
}
public void MoveWindowToDesktop(IntPtr TopLevelWindow, Guid CurrentDesktop)
public static void MoveWindowToDesktop(IntPtr TopLevelWindow, Guid CurrentDesktop)
{
if (!Enabled())
if (_static_manager == null)
return;
int hr = _manager.MoveWindowToDesktop(TopLevelWindow, CurrentDesktop);
int hr = _static_manager.MoveWindowToDesktop(TopLevelWindow, CurrentDesktop);
if (hr != 0)
{
//Marshal.ThrowExceptionForHR(hr);