Add hotkey to open LightBulb from tray (#323)

Tyrrrz · Jul 18, 2024 · d1d8de8 · d1d8de8
1 parent f1e041c
commit d1d8de8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/LightBulb/Services/SettingsService.cs b/LightBulb/Services/SettingsService.cs
@@ -207,6 +207,13 @@ public IReadOnlyList<ExternalApplication>? WhitelistedApplications
 
     // HotKeys
 
+    private HotKey _focusWindowHotKey;
+    public HotKey FocusWindowHotKey
+    {
+        get => _focusWindowHotKey;
+        set => SetProperty(ref _focusWindowHotKey, value);
+    }
+
     private HotKey _toggleHotKey;
     public HotKey ToggleHotKey
     {

diff --git a/LightBulb/ViewModels/Components/Settings/HotKeySettingsTabViewModel.cs b/LightBulb/ViewModels/Components/Settings/HotKeySettingsTabViewModel.cs
@@ -6,6 +6,12 @@ namespace LightBulb.ViewModels.Components.Settings;
 public class HotKeySettingsTabViewModel(SettingsService settingsService)
     : SettingsTabViewModelBase(settingsService, 4, "Hotkeys")
 {
+    public HotKey FocusWindowHotKey
+    {
+        get => SettingsService.FocusWindowHotKey;
+        set => SettingsService.FocusWindowHotKey = value;
+    }
+
     public HotKey ToggleHotKey
     {
         get => SettingsService.ToggleHotKey;

diff --git a/LightBulb/Views/Components/Settings/HotKeySettingsTabView.axaml b/LightBulb/Views/Components/Settings/HotKeySettingsTabView.axaml
@@ -6,8 +6,21 @@
     xmlns:settings="clr-namespace:LightBulb.ViewModels.Components.Settings"
     x:DataType="settings:HotKeySettingsTabViewModel">
     <StackPanel Margin="16" Orientation="Vertical">
-        <!--  Toggle hotkey  -->
+        <!--  Focus window hotkey  -->
         <DockPanel>
+            <TextBlock
+                DockPanel.Dock="Left"
+                Text="Open LightBulb"
+                ToolTip.Tip="Global hotkey to bring LightBulb's main window to the foreground" />
+            <controls:HotKeyTextBox
+                Width="120"
+                HorizontalAlignment="Right"
+                DockPanel.Dock="Right"
+                HotKey="{Binding FocusWindowHotKey}" />
+        </DockPanel>
+
+        <!--  Toggle hotkey  -->
+        <DockPanel Margin="0,16,0,0">
             <TextBlock
                 DockPanel.Dock="Left"
                 Text="Toggle LightBulb"