From e9ce9ab87a9ca51311a386728e04d653ce77ee9c Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Thu, 15 Apr 2021 02:11:08 -0700 Subject: [PATCH] Changing default key for FanzyZones (#10751) * Changing default key * Update Settings.h --- src/modules/fancyzones/lib/Settings.h | 3 ++- .../FZConfigProperties.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/fancyzones/lib/Settings.h b/src/modules/fancyzones/lib/Settings.h index 03a1df5899..ef085e1221 100644 --- a/src/modules/fancyzones/lib/Settings.h +++ b/src/modules/fancyzones/lib/Settings.h @@ -12,6 +12,7 @@ namespace ZonedWindowProperties const wchar_t MultiMonitorDeviceID[] = L"FancyZones#MultiMonitorDevice"; } +// in reality, this file needs to be kept in sync currently with src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs struct Settings { enum struct OverlappingZonesAlgorithm : int @@ -45,7 +46,7 @@ struct Settings std::wstring zoneHighlightColor = L"#008CFF"; int zoneHighlightOpacity = 50; OverlappingZonesAlgorithm overlappingZonesAlgorithm = OverlappingZonesAlgorithm::Smallest; - PowerToysSettings::HotkeyObject editorHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, false, VK_OEM_3); + PowerToysSettings::HotkeyObject editorHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, true, VK_OEM_3); std::wstring excludedApps = L""; std::vector excludedAppsArray; }; diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs index 56ce046585..bb5caa0afe 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs @@ -9,7 +9,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library { public class FZConfigProperties { - public static readonly HotkeySettings DefaultHotkeyValue = new HotkeySettings(true, false, false, false, 0xc0); + // in reality, this file needs to be kept in sync currently with src\modules\fancyzones\lib\Settings.h + public static readonly HotkeySettings DefaultHotkeyValue = new HotkeySettings(true, false, false, true, 0xc0); public FZConfigProperties() {