diff --git a/src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs b/src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs index 6016d6284a..8c8c6bd616 100644 --- a/src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs +++ b/src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs @@ -4,8 +4,7 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using Microsoft.PowerToys.Settings.UI.Helpers; +using ManagedCommon; using Microsoft.PowerToys.Settings.UI.Library; using Windows.System; diff --git a/src/RunnerV2/RunnerV2/NativeMethods.cs b/src/RunnerV2/RunnerV2/NativeMethods.cs index bb08c06aa0..d78a05933b 100644 --- a/src/RunnerV2/RunnerV2/NativeMethods.cs +++ b/src/RunnerV2/RunnerV2/NativeMethods.cs @@ -5,7 +5,7 @@ using System; using System.Drawing; using System.Runtime.InteropServices; -using Microsoft.PowerToys.Settings.UI.Helpers; +using ManagedCommon; namespace RunnerV2 { diff --git a/src/RunnerV2/RunnerV2/RunnerV2.csproj b/src/RunnerV2/RunnerV2/RunnerV2.csproj index c52cd30d2f..6776e6acc1 100644 --- a/src/RunnerV2/RunnerV2/RunnerV2.csproj +++ b/src/RunnerV2/RunnerV2/RunnerV2.csproj @@ -16,7 +16,6 @@ - diff --git a/src/settings-ui/Settings.UI.Library/HotkeySettingsControlHook.cs b/src/common/ManagedCommon/HotkeySettingsControlHook.cs similarity index 96% rename from src/settings-ui/Settings.UI.Library/HotkeySettingsControlHook.cs rename to src/common/ManagedCommon/HotkeySettingsControlHook.cs index 0ff67df638..cf53a83c4b 100644 --- a/src/settings-ui/Settings.UI.Library/HotkeySettingsControlHook.cs +++ b/src/common/ManagedCommon/HotkeySettingsControlHook.cs @@ -3,10 +3,9 @@ // See the LICENSE file in the project root for more information. using System; - using PowerToys.Interop; -namespace Microsoft.PowerToys.Settings.UI.Library +namespace ManagedCommon { public delegate void KeyEvent(int key); @@ -14,7 +13,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library public delegate bool FilterAccessibleKeyboardEvents(int key, UIntPtr extraInfo); - public class HotkeySettingsControlHook : IDisposable + public partial class HotkeySettingsControlHook : IDisposable { private const int WmKeyDown = 0x100; private const int WmKeyUp = 0x101; diff --git a/src/settings-ui/Settings.UI/Helpers/NativeKeyboardHelper.cs b/src/common/ManagedCommon/NativeKeyboardHelper.cs similarity index 98% rename from src/settings-ui/Settings.UI/Helpers/NativeKeyboardHelper.cs rename to src/common/ManagedCommon/NativeKeyboardHelper.cs index 43fb8aeb10..a07c63e87f 100644 --- a/src/settings-ui/Settings.UI/Helpers/NativeKeyboardHelper.cs +++ b/src/common/ManagedCommon/NativeKeyboardHelper.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.PowerToys.Settings.UI.Helpers +namespace ManagedCommon { public static class NativeKeyboardHelper { diff --git a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs index 35132b2049..d4d3a2dddc 100644 --- a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs +++ b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.InteropServices; using System.Text; +using ManagedCommon; namespace Microsoft.PowerToys.Settings.UI.Helpers { diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs index ba053e1124..b0bd3c6447 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using CommunityToolkit.WinUI; +using ManagedCommon; using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;