Use DevWinUI for shortcut and textblock controls

AuraClick/App.xaml

@@ -8,6 +8,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="/Styles.xaml" />
+                <ResourceDictionary Source="ms-appx:///DevWinUI.Controls/Themes/Generic.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->

AuraClick/AuraClick.csproj

@@ -32,14 +32,15 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DevWinUI.Controls" Version="9.9.4" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.3.260402-preview2" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.275">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.3.260402-preview2" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1839" />
-    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="2.0.12" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.1" />
     <PackageReference Include="WinUIEx" Version="2.9.0" />
   </ItemGroup>
 

AuraClick/Helpers/HotkeyManager.cs

@@ -0,0 +1,98 @@
+// Copyright (C) 2026 Ryan Luu
+//
+// This file is part of Aura Click.
+//
+// Aura Click is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Aura Click is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
+
+using DevWinUI;
+using Windows.System;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.Input.KeyboardAndMouse;
+using WinRT.Interop;
+
+namespace AuraClick.Helpers;
+
+internal static class HotkeyManager
+{
+    public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
+    {
+        if (!TryGetHotkey(keys, out var modifiers, out var virtualKey))
+        {
+            return false;
+        }
+
+        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
+        UnregisterHotkey(hotkeyId);
+        return PInvoke.RegisterHotKey(hWnd, hotkeyId, ToWin32Modifiers(modifiers) | HOT_KEY_MODIFIERS.MOD_NOREPEAT, (uint)virtualKey);
+    }
+
+    public static bool UnregisterHotkey(int hotkeyId)
+        => PInvoke.UnregisterHotKey(new HWND(WindowNative.GetWindowHandle(App.MainWindow)), hotkeyId);
+
+    private static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    {
+        modifiers = VirtualKeyModifiers.None;
+        virtualKey = VirtualKey.None;
+
+        if (keys is null)
+        {
+            return false;
+        }
+
+        foreach (var key in keys)
+        {
+            if (key is not KeyVisualInfo keyInfo || keyInfo.Key is not VirtualKey keyCode)
+            {
+                continue;
+            }
+
+            if (TryGetModifier(keyCode, out var modifier))
+            {
+                modifiers |= modifier;
+            }
+            else
+            {
+                virtualKey = keyCode;
+            }
+        }
+
+        return virtualKey != VirtualKey.None;
+    }
+
+    private static bool TryGetModifier(VirtualKey keyCode, out VirtualKeyModifiers modifier)
+    {
+        modifier = keyCode switch
+        {
+            VirtualKey.Control or VirtualKey.LeftControl or VirtualKey.RightControl => VirtualKeyModifiers.Control,
+            VirtualKey.Shift or VirtualKey.LeftShift or VirtualKey.RightShift => VirtualKeyModifiers.Shift,
+            VirtualKey.Menu or VirtualKey.LeftMenu or VirtualKey.RightMenu => VirtualKeyModifiers.Menu,
+            VirtualKey.LeftWindows or VirtualKey.RightWindows => VirtualKeyModifiers.Windows,
+            _ => VirtualKeyModifiers.None,
+        };
+
+        return modifier != VirtualKeyModifiers.None;
+    }
+
+    private static HOT_KEY_MODIFIERS ToWin32Modifiers(VirtualKeyModifiers modifiers)
+    {
+        HOT_KEY_MODIFIERS result = 0;
+        if ((modifiers & VirtualKeyModifiers.Control) != 0) result |= HOT_KEY_MODIFIERS.MOD_CONTROL;
+        if ((modifiers & VirtualKeyModifiers.Menu) != 0) result |= HOT_KEY_MODIFIERS.MOD_ALT;
+        if ((modifiers & VirtualKeyModifiers.Shift) != 0) result |= HOT_KEY_MODIFIERS.MOD_SHIFT;
+        if ((modifiers & VirtualKeyModifiers.Windows) != 0) result |= HOT_KEY_MODIFIERS.MOD_WIN;
+        return result;
+    }
+
+}

AuraClick/MainWindow.xaml

@@ -8,9 +8,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:windowex="using:WinUIEx"
     Width="400"
-    Height="340"
+    Height="360"
     MinWidth="400"
-    MinHeight="340"
+    MinHeight="360"
     mc:Ignorable="d">
 
     <Grid>

AuraClick/NativeMethods.txt

@@ -1,10 +1,10 @@
 RegisterHotKey
 UnregisterHotKey
-CallWindowProc
 SendInput
 SetProcessInformation
 GetCurrentProcess
 SetPriorityClass
 PROCESS_POWER_THROTTLING_CURRENT_VERSION
 PROCESS_POWER_THROTTLING_EXECUTION_SPEED
-PROCESS_POWER_THROTTLING_STATE
+PROCESS_POWER_THROTTLING_STATE
+WM_HOTKEY

AuraClick/Pages/MainPage.xaml

@@ -5,9 +5,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:controls="using:AuraClick.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
     xmlns:helpers="using:AuraClick.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -43,7 +43,7 @@
 
         <!--  Click Interval  -->
         <StackPanel Grid.ColumnSpan="2" Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock
+            <dev:IsEnabledTextBlock
                 x:Name="ClickIntervalTextBlock"
                 x:Uid="TextBlockClickInterval"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}" />
@@ -110,11 +110,15 @@
             Grid.Row="2"
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock
+            <dev:IsEnabledTextBlock
                 x:Name="HotkeyTextBlock"
                 x:Uid="TextBlockHotkey"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}" />
-            <Button Content="F6" IsEnabled="False" />
+            <dev:Shortcut
+                x:Name="ToggleShortcut"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}"
+                PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick"
+                SecondaryButtonClick="ToggleShortcut_SecondaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->
@@ -178,7 +182,8 @@
                 x:Uid="ButtonSettings"
                 Grid.Column="1"
                 Height="32"
-                Click="SettingsButton_Click">
+                Click="SettingsButton_Click"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}">
                 <AnimatedIcon FallbackIconSource="{ui:FontIconSource Glyph=&#xE713;}">
                     <AnimatedIcon.Source>
                         <animatedvisuals:AnimatedSettingsVisualSource />