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

[PT Run/FancyZones] Exclude Launcher from zonable windows improvement (#9071)

Browse Source 
* excluding launcher from fancy zones setting GWL_STYLE WS_POPUP 


fix WS_POPUP type

* Migrate spelling-0.0.19 changes from main

* rebase fix

* fix spellcheck

Co-authored-by: Dustin L. Howett <duhowett@microsoft.com>
This commit is contained in:
Davide Giacometti
2021-12-21 15:18:36 +01:00
committed by GitHub
parent dc08987a60
commit 57cdae724a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/fancyzones/FancyZonesLib/util.cpp
View File

@@ -16,7 +16,6 @@
// Non-Localizable strings // Non-Localizable strings
namespace NonLocalizable namespace NonLocalizable
{ {
const wchar_t PowerToysAppPowerLauncher[] = L"POWERTOYS.POWERLAUNCHER.EXE";
const wchar_t PowerToysAppFZEditor[] = L"POWERTOYS.FANCYZONESEDITOR.EXE"; const wchar_t PowerToysAppFZEditor[] = L"POWERTOYS.FANCYZONESEDITOR.EXE";
const wchar_t SplashClassName[] = L"MsoSplash"; const wchar_t SplashClassName[] = L"MsoSplash";
} }
@@ -45,10 +44,6 @@ namespace
{ {
return false; return false;
} }
if (find_app_name_in_path(processPath, { NonLocalizable::PowerToysAppPowerLauncher }))
{
return false;
}
if (find_app_name_in_path(processPath, { NonLocalizable::PowerToysAppFZEditor })) if (find_app_name_in_path(processPath, { NonLocalizable::PowerToysAppFZEditor }))
{ {
return false; return false;

11
src/modules/launcher/PowerLauncher/Helper/WindowsInteropHelper.cs
View File

@@ -20,6 +20,8 @@ namespace PowerLauncher.Helper
private const int GWL_STYLE = -16; // WPF's Message code for Title Bar's Style private const int GWL_STYLE = -16; // WPF's Message code for Title Bar's Style
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Matching COM")] [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Matching COM")]
private const int WS_SYSMENU = 0x80000; // WPF's Message code for System Menu private const int WS_SYSMENU = 0x80000; // WPF's Message code for System Menu
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Matching COM")]
private const int WS_POPUP = 1 << 31; // 0x80000000
private static IntPtr _hwnd_shell; private static IntPtr _hwnd_shell;
private static IntPtr _hwnd_desktop; private static IntPtr _hwnd_desktop;
@@ -169,6 +171,15 @@ namespace PowerLauncher.Helper
_ = NativeMethods.SetWindowLong(hwnd, GWL_STYLE, NativeMethods.GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU); _ = NativeMethods.SetWindowLong(hwnd, GWL_STYLE, NativeMethods.GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU);
} }
/// <summary>
/// Set WS_POPUP to make FancyZones ignoring the Window
/// </summary>
public static void SetPopupStyle(Window win)
{
var hwnd = new WindowInteropHelper(win).Handle;
_ = NativeMethods.SetWindowLong(hwnd, GWL_STYLE, NativeMethods.GetWindowLong(hwnd, GWL_STYLE) | WS_POPUP);
}
/// <summary> /// <summary>
/// Transforms pixels to Device Independent Pixels used by WPF /// Transforms pixels to Device Independent Pixels used by WPF
/// </summary> /// </summary>

6
src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
View File

@@ -64,6 +64,12 @@ namespace PowerLauncher
PowerToysTelemetry.Log.WriteEvent(telemetryEvent); PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
} }
protected override void OnSourceInitialized(EventArgs e)
{
base.OnSourceInitialized(e);
WindowsInteropHelper.SetPopupStyle(this);
}
private void CheckForFirstDelete(object sender, ElapsedEventArgs e) private void CheckForFirstDelete(object sender, ElapsedEventArgs e)
{ {
if (_firstDeleteTimer != null) if (_firstDeleteTimer != null)