Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[PTRun] Fix always show after executing context menu result (#21291)

Browse Source 
* fix always show

* add tests

* remove workaround
This commit is contained in:
Henrik Lau Eriksson
2022-10-25 23:27:18 +02:00
committed by GitHub
parent a3042b8435
commit 460f242967
10 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/ContextMenuHelper.cs
View File

@@ -42,9 +42,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
return false;
}
// As a workaround to close PT Run after executing the context menu command, we switch to the window before closing it (Issue #16601).
// We use the setting OpenAfterKillAndClose to detect if we have to switch.
windowData.CloseThisWindow(!WindowWalkerSettings.Instance.OpenAfterKillAndClose);
windowData.CloseThisWindow();
return !WindowWalkerSettings.Instance.OpenAfterKillAndClose;
},
@@ -102,12 +100,6 @@ namespace Microsoft.Plugin.WindowWalker.Components
}
}
// As a workaround to close PT Run before executing the command, we switch to the window before killing it's process
if (!WindowWalkerSettings.Instance.OpenAfterKillAndClose)
{
window.SwitchToWindow();
}
// Kill process
window.Process.KillThisProcess(WindowWalkerSettings.Instance.KillProcessTree);
return !WindowWalkerSettings.Instance.OpenAfterKillAndClose;

7
src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs
View File

@@ -237,13 +237,8 @@ namespace Microsoft.Plugin.WindowWalker.Components
/// <summary>
/// Closes the window
/// </summary>
internal void CloseThisWindow(bool switchBeforeClose)
internal void CloseThisWindow()
{
if (switchBeforeClose)
{
SwitchToWindow();
}
_ = NativeMethods.SendMessage(Hwnd, Win32Constants.WM_SYSCOMMAND, Win32Constants.SC_CLOSE);
}