Add a hotkey settings control and use it in FancyZones (#450)

Add a hotkey settings control and use it in FancyZones

src/modules/fancyzones/lib/FancyZones.cpp

@@ -24,6 +24,7 @@ public:
     IFACEMETHODIMP_(void) WindowCreated(HWND window) noexcept;
     IFACEMETHODIMP_(bool) OnKeyDown(PKBDLLHOOKSTRUCT info) noexcept;
     IFACEMETHODIMP_(void) ToggleEditor() noexcept;
+    IFACEMETHODIMP_(void) SettingsChanged() noexcept;
 
     // IZoneWindowHost
     IFACEMETHODIMP_(void) ToggleZoneViewers() noexcept;
@@ -117,7 +118,7 @@ IFACEMETHODIMP_(void) FancyZones::Run() noexcept
     m_window = CreateWindowExW(WS_EX_TOOLWINDOW, L"SuperFancyZones", L"", WS_POPUP, 0, 0, 0, 0, nullptr, nullptr, m_hinstance, this);
     if (!m_window) return;
 
-    RegisterHotKey(m_window, 1, MOD_WIN, VK_OEM_3);
+    RegisterHotKey(m_window, 1, m_settings->GetSettings().editorHotkey.get_modifiers(), m_settings->GetSettings().editorHotkey.get_code());
     VirtualDesktopChanged();
 }
 
@@ -328,6 +329,13 @@ void FancyZones::ToggleEditor() noexcept
     waitForEditorThread.detach();
 }
 
+void FancyZones::SettingsChanged() noexcept
+{
+    // Update the hotkey
+    UnregisterHotKey(m_window, 1);
+    RegisterHotKey(m_window, 1, m_settings->GetSettings().editorHotkey.get_modifiers(), m_settings->GetSettings().editorHotkey.get_code());
+}
+
 // IZoneWindowHost
 IFACEMETHODIMP_(void) FancyZones::ToggleZoneViewers() noexcept
 {

src/modules/fancyzones/lib/Settings.cpp

@@ -52,7 +52,7 @@ private:
     } m_configStrings[1] = {
         { L"fancyzones_zoneHighlightColor", &m_settings.zoneHightlightColor, IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR },
     };
-
+    const std::wstring m_editor_hotkey_name = L"fancyzones_editor_hotkey";
 };
 
 IFACEMETHODIMP_(bool) FancyZonesSettings::GetConfig(_Out_ PWSTR buffer, _Out_ int *buffer_size) noexcept
@@ -73,6 +73,7 @@ IFACEMETHODIMP_(bool) FancyZonesSettings::GetConfig(_Out_ PWSTR buffer, _Out_ in
         IDS_SETTING_LAUNCH_EDITOR_BUTTON,
         IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION
     );
+    settings.add_hotkey(m_editor_hotkey_name, IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL, m_settings.editorHotkey);
 
     for (auto const& setting : m_configBools)
     {
@@ -91,6 +92,7 @@ IFACEMETHODIMP_(void) FancyZonesSettings::SetConfig(PCWSTR config) noexcept try
 {
     LoadSettings(config, false /*fromFile*/);
     SaveSettings();
+    m_callback->SettingsChanged();
     Trace::SettingsChanged(m_settings);
 }
 CATCH_LOG();
@@ -129,6 +131,11 @@ void FancyZonesSettings::LoadSettings(PCWSTR config, bool fromFile) noexcept try
             *setting.value = values.get_string_value(setting.name);
         }
     }
+
+    if (values.is_object_value(m_editor_hotkey_name))
+    {
+        m_settings.editorHotkey = PowerToysSettings::HotkeyObject::from_json(values.get_json(m_editor_hotkey_name));
+    }
 }
 CATCH_LOG();
 
@@ -146,6 +153,8 @@ void FancyZonesSettings::SaveSettings() noexcept try
         values.add_property(setting.name, *setting.value);
     }
 
+    values.add_property(m_editor_hotkey_name, m_settings.editorHotkey);
+
     values.save_to_settings_file();
 }
 CATCH_LOG();

src/modules/fancyzones/lib/Settings.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #define ZONE_STAMP L"FancyZones_zone"
+#include <common/settings_objects.h>
 
 struct Settings
 {
@@ -15,6 +16,7 @@ struct Settings
     bool use_standalone_editor = true;
     bool use_cursorpos_editor_startupscreen = true;
     std::wstring zoneHightlightColor = L"#0078D7";
+    PowerToysSettings::HotkeyObject editorHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, false, VK_OEM_3, L"~");
 };
 
 interface __declspec(uuid("{BA4E77C4-6F44-4C5D-93D3-CBDE880495C2}")) IFancyZonesSettings : public IUnknown

src/modules/fancyzones/lib/resource.h

@@ -12,3 +12,4 @@
 #define IDS_SETTING_LAUNCH_EDITOR_LABEL 112
 #define IDS_SETTING_LAUNCH_EDITOR_BUTTON 113
 #define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 114
+#define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL 115