mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +01:00
Fix ColorPicker editor and OOBE FancyZones snap (#13598)
This commit is contained in:
committed by
GitHub
parent
063beddb01
commit
805d8d81c5
@@ -2,6 +2,7 @@
|
|||||||
// The Microsoft Corporation licenses this file to you under the MIT license.
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using ColorPicker.Helpers;
|
using ColorPicker.Helpers;
|
||||||
|
|
||||||
@@ -26,5 +27,11 @@ namespace ColorPicker
|
|||||||
e.Cancel = true;
|
e.Cancel = true;
|
||||||
_appStateHandler.EndUserSession();
|
_appStateHandler.EndUserSession();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnSourceInitialized(EventArgs e)
|
||||||
|
{
|
||||||
|
base.OnSourceInitialized(e);
|
||||||
|
NativeMethods.SetPopupStyle(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ using System;
|
|||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Runtime.Versioning;
|
using System.Runtime.Versioning;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Interop;
|
||||||
|
|
||||||
namespace ColorPicker
|
namespace ColorPicker
|
||||||
{
|
{
|
||||||
@@ -13,6 +15,9 @@ namespace ColorPicker
|
|||||||
// will have to rename
|
// will have to rename
|
||||||
public static class NativeMethods
|
public static class NativeMethods
|
||||||
{
|
{
|
||||||
|
private const int GWL_STYLE = -16;
|
||||||
|
private const int WS_POPUP = 1 << 31; // 0x80000000
|
||||||
|
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Interop")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Interop")]
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Interop")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Interop")]
|
||||||
public const int WH_KEYBOARD_LL = 13;
|
public const int WH_KEYBOARD_LL = 13;
|
||||||
@@ -168,5 +173,17 @@ namespace ColorPicker
|
|||||||
|
|
||||||
[DllImport("user32.dll", CharSet = CharSet.Unicode)]
|
[DllImport("user32.dll", CharSet = CharSet.Unicode)]
|
||||||
internal static extern int GetWindowText(int hwnd, StringBuilder text, int count);
|
internal static extern int GetWindowText(int hwnd, StringBuilder text, int count);
|
||||||
|
|
||||||
|
[DllImport("user32.dll", SetLastError = true)]
|
||||||
|
internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
|
||||||
|
|
||||||
|
[DllImport("user32.dll")]
|
||||||
|
internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
|
||||||
|
|
||||||
|
internal static void SetPopupStyle(Window win)
|
||||||
|
{
|
||||||
|
var hwnd = new WindowInteropHelper(win).Handle;
|
||||||
|
_ = SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) | WS_POPUP);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,12 +9,21 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
|
|||||||
{
|
{
|
||||||
public static class NativeMethods
|
public static class NativeMethods
|
||||||
{
|
{
|
||||||
|
private const int GWL_STYLE = -16;
|
||||||
|
private const int WS_POPUP = 1 << 31; // 0x80000000
|
||||||
|
|
||||||
[DllImport("user32.dll")]
|
[DllImport("user32.dll")]
|
||||||
internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
|
internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
|
||||||
|
|
||||||
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
|
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
|
||||||
internal static extern short GetAsyncKeyState(int vKey);
|
internal static extern short GetAsyncKeyState(int vKey);
|
||||||
|
|
||||||
|
[DllImport("user32.dll", SetLastError = true)]
|
||||||
|
internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
|
||||||
|
|
||||||
|
[DllImport("user32.dll")]
|
||||||
|
internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
|
||||||
|
|
||||||
#pragma warning disable CA1401 // P/Invokes should not be visible
|
#pragma warning disable CA1401 // P/Invokes should not be visible
|
||||||
[DllImport("user32.dll")]
|
[DllImport("user32.dll")]
|
||||||
public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
|
public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
|
||||||
@@ -28,5 +37,10 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
|
|||||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
|
[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
|
||||||
public static extern bool FreeLibrary(IntPtr hModule);
|
public static extern bool FreeLibrary(IntPtr hModule);
|
||||||
#pragma warning restore CA1401 // P/Invokes should not be visible
|
#pragma warning restore CA1401 // P/Invokes should not be visible
|
||||||
|
|
||||||
|
public static void SetPopupStyle(IntPtr hwnd)
|
||||||
|
{
|
||||||
|
_ = SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) | WS_POPUP);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using System.Windows.Interop;
|
||||||
using interop;
|
using interop;
|
||||||
using Microsoft.PowerToys.Settings.UI.Helpers;
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
||||||
using Microsoft.PowerToys.Settings.UI.OOBE.Views;
|
using Microsoft.PowerToys.Settings.UI.OOBE.Views;
|
||||||
@@ -83,5 +84,12 @@ namespace PowerToys.Settings
|
|||||||
((App)Application.Current).OpenSettingsWindow(type);
|
((App)Application.Current).OpenSettingsWindow(type);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnSourceInitialized(EventArgs e)
|
||||||
|
{
|
||||||
|
base.OnSourceInitialized(e);
|
||||||
|
var hwnd = new WindowInteropHelper(this).Handle;
|
||||||
|
NativeMethods.SetPopupStyle(hwnd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user