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

new feature: shift click empty desktop to switch foreground/background window; ctrl click empty desktop to bring current foreground window to previous z-order and update the screen size/pos of background record with current value

Browse source
This commit is contained in:
Kang Yu 2023-09-10 16:44:57 -07:00
parent 1781698364
commit 4f3965a367
3 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -285,18 +285,43 @@ namespace PersistentWindows.Common
IntPtr hwnd = foreGroundWindow[curDisplayKey];
if ( (User32.GetKeyState(0x11) & 0x8000) == 0 //ctrl key NOT pressed
&& (User32.GetKeyState(0x12) & 0x8000) == 0 //alt key NOT pressed
&& (User32.GetKeyState(0x10) & 0x8000) == 0 //shift key NOT pressed
&& (User32.GetKeyState(0x5b) & 0x8000) == 0 //lwin logo key NOT pressed
&& (User32.GetKeyState(0x5c) & 0x8000) == 0 //rwin logo key NOT pressed
)
bool ctrl_key_pressed = (User32.GetKeyState(0x11) & 0x8000) != 0;
bool alt_key_pressed = (User32.GetKeyState(0x12) & 0x8000) != 0;
bool shift_key_pressed = (User32.GetKeyState(0x10) & 0x8000) != 0;
//&& (User32.GetKeyState(0x5b) & 0x8000) == 0 //lwin logo key NOT pressed
//&& (User32.GetKeyState(0x5c) & 0x8000) == 0 //rwin logo key NOT pressed
if (realForeGroundWindow == vacantDeskWindow)
{
if (realForeGroundWindow == vacantDeskWindow)
SwitchForeBackground(hwnd); //restore to background pos
else
SwitchForeBackground(hwnd, toForeground:true); //restore to foreground window to its previous pos
if (!ctrl_key_pressed && !alt_key_pressed)
{
//restore window to previous background position
SwitchForeBackground(hwnd);
if (shift_key_pressed)
{
//shift focus to new foreground window
IntPtr new_foregnd = GetForegroundWindow();
SwitchForeBackground(new_foregnd, toForeground: true);
}
}
else if (ctrl_key_pressed && !alt_key_pressed && !shift_key_pressed)
{
//restore to previous background zorder with current size/pos
SwitchForeBackground(hwnd, updateBackgroundPos: true);
}
else if (!ctrl_key_pressed && alt_key_pressed && !shift_key_pressed)
{
FgWindowToBottom();
}
}
else
{
if (!ctrl_key_pressed && !alt_key_pressed && !shift_key_pressed)
//restore window to previous foreground position
SwitchForeBackground(hwnd, toForeground: true);
}
CaptureApplicationsOnCurrentDisplays(curDisplayKey);
});
captureTimer = new Timer(state =>
@ -1748,13 +1773,7 @@ namespace PersistentWindows.Common
Log.Event("Bring foreground window {0} to bottom", GetWindowTitle(hwnd));
}
public void BringForegroundToBackground()
{
IntPtr hwnd = GetForegroundWindow();
SwitchForeBackground(hwnd, issueFromIcon:true);
}
public void SwitchForeBackground(IntPtr hwnd, bool toForeground=false, bool issueFromIcon=false)
public void SwitchForeBackground(IntPtr hwnd, bool toForeground=false, bool updateBackgroundPos=false)
{
if (hwnd == IntPtr.Zero || IsTaskBar(hwnd))
return;
@ -1773,6 +1792,7 @@ namespace PersistentWindows.Common
{
continue;
}
IntPtr prevZwnd = metrics.PrevZorderWindow;
if (prevZwnd != front_hwnd)
{
@ -1781,20 +1801,18 @@ namespace PersistentWindows.Common
if (toForeground)
continue;
RestoreZorder(hwnd, prevZwnd);
if (updateBackgroundPos)
{
//update with current size/pos
monitorApplications[curDisplayKey][hwnd][prevIndex].ScreenPosition = cur_metrics.ScreenPosition;
monitorApplications[curDisplayKey][hwnd][prevIndex].WindowPlacement = cur_metrics.WindowPlacement;
break;
}
}
restoringFromMem = true;
RestoreApplicationsOnCurrentDisplays(curDisplayKey, hwnd, metrics.CaptureTime);
restoringFromMem = false;
if (!toForeground && issueFromIcon)
{
IntPtr fgWnd= GetForegroundWindow();
if (fgWnd != hwnd)
{
ignoreForegroundEvent = true;
User32.SetForegroundWindow(fgWnd);
}
}
CaptureApplicationsOnCurrentDisplays(curDisplayKey);
break;
}
}

5
Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
View file

@ -538,11 +538,6 @@ namespace PersistentWindows.SystrayShell
pwp.RestoreSnapshot(id);
}
static public void BringForegroundToBackground()
{
pwp.BringForegroundToBackground();
}
static public void FgWindowToBottom()
{
pwp.FgWindowToBottom();

2
Ninjacrab.PersistentWindows.Solution/SystrayShell/SystrayForm.cs
View file

@ -114,8 +114,6 @@ namespace PersistentWindows.SystrayShell
if (ctrlKeyPressed > 0)
if (altKeyPressed > 0)
Program.FgWindowToBottom();
else
Program.BringForegroundToBackground();
else
//restore unnamed(default) snapshot
Program.RestoreSnapshot(0);