From 8f59247acb6632b0712731df5df2ebc6dd556748 Mon Sep 17 00:00:00 2001 From: vldmr11080 <57061786+vldmr11080@users.noreply.github.com> Date: Wed, 20 May 2020 10:49:28 +0200 Subject: [PATCH] [FancyZones] Remove "keep windows pinned to virtual desktop location" settings (#3093) * Remove keep windows pinned to virtual desktop location FancyZones settings * Remove virtual desktop switch handling for this scenario. --- .../FZConfigProperties.cs | 4 -- .../Strings/en-us/Resources.resw | 6 --- .../ViewModels/FancyZonesViewModel.cs | 20 ---------- .../Views/FancyZonesPage.xaml | 10 ----- .../ViewModelTests/FancyZones.cs | 18 --------- src/modules/fancyzones/lib/FancyZones.cpp | 8 ---- src/modules/fancyzones/lib/Settings.cpp | 3 +- src/modules/fancyzones/lib/Settings.h | 1 - src/modules/fancyzones/lib/fancyzones.rc | 3 +- src/modules/fancyzones/lib/resource.h | 37 +++++++++---------- src/modules/fancyzones/lib/trace.cpp | 1 - .../tests/UnitTests/FancyZones.Spec.cpp | 7 ---- .../UnitTests/FancyZonesSettings.Spec.cpp | 14 ------- .../FancyZonesSettingsTests.cs | 2 - src/tests/win-app-driver/PowerToysSession.cs | 2 +- 15 files changed, 21 insertions(+), 115 deletions(-) diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs index 986d42d4a6..5b90a7bbbc 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs @@ -16,7 +16,6 @@ namespace Microsoft.PowerToys.Settings.UI.Lib this.FancyzonesMoveWindowsAcrossMonitors = new BoolProperty(); this.FancyzonesDisplayChangeMoveWindows = new BoolProperty(); this.FancyzonesZoneSetChangeMoveWindows = new BoolProperty(); - this.FancyzonesVirtualDesktopChangeMoveWindows = new BoolProperty(); this.FancyzonesAppLastZoneMoveWindows = new BoolProperty(); this.UseCursorposEditorStartupscreen = new BoolProperty(ConfigDefaults.DefaultUseCursorposEditorStartupscreen); this.FancyzonesShowOnAllMonitors = new BoolProperty(); @@ -56,9 +55,6 @@ namespace Microsoft.PowerToys.Settings.UI.Lib [JsonPropertyName("fancyzones_zoneSetChange_moveWindows")] public BoolProperty FancyzonesZoneSetChangeMoveWindows { get; set; } - [JsonPropertyName("fancyzones_virtualDesktopChange_moveWindows")] - public BoolProperty FancyzonesVirtualDesktopChangeMoveWindows { get; set; } - [JsonPropertyName("fancyzones_appLastZone_moveWindows")] public BoolProperty FancyzonesAppLastZoneMoveWindows { get; set; } diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw index 361c313080..47f8caeba1 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw +++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw @@ -281,9 +281,6 @@ Edit hot key / shortcut - - Keep windows pinned to multiple desktops in the same zone when the active desktop changes - Launch Zones Editor @@ -311,9 +308,6 @@ Follow mouse cursor instead of focus when launching editor in a multi screen environment - - Move newly created windows to their last known zone - Zone behavior diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/FancyZonesViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/FancyZonesViewModel.cs index f3d3a838cb..6de0e3fdaa 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/FancyZonesViewModel.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/FancyZonesViewModel.cs @@ -43,7 +43,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels this._moveWindowsAcrossMonitors = Settings.Properties.FancyzonesMoveWindowsAcrossMonitors.Value; this._displayChangemoveWindows = Settings.Properties.FancyzonesDisplayChangeMoveWindows.Value; this._zoneSetChangeMoveWindows = Settings.Properties.FancyzonesZoneSetChangeMoveWindows.Value; - this._virtualDesktopChangeMoveWindows = Settings.Properties.FancyzonesVirtualDesktopChangeMoveWindows.Value; this._appLastZoneMoveWindows = Settings.Properties.FancyzonesAppLastZoneMoveWindows.Value; this._useCursorPosEditorStartupScreen = Settings.Properties.UseCursorposEditorStartupscreen.Value; this._showOnAllMonitors = Settings.Properties.FancyzonesShowOnAllMonitors.Value; @@ -82,7 +81,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels private bool _moveWindowsAcrossMonitors; private bool _displayChangemoveWindows; private bool _zoneSetChangeMoveWindows; - private bool _virtualDesktopChangeMoveWindows; private bool _appLastZoneMoveWindows; private bool _useCursorPosEditorStartupScreen; private bool _showOnAllMonitors; @@ -225,24 +223,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels } } - public bool VirtualDesktopChangeMoveWindows - { - get - { - return _virtualDesktopChangeMoveWindows; - } - - set - { - if (value != _virtualDesktopChangeMoveWindows) - { - _virtualDesktopChangeMoveWindows = value; - Settings.Properties.FancyzonesVirtualDesktopChangeMoveWindows.Value = value; - RaisePropertyChanged(); - } - } - } - public bool AppLastZoneMoveWindows { get diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml index c7c8c99a22..9baac1c6c2 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml @@ -108,16 +108,6 @@ Margin="{StaticResource SmallTopMargin}" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/> - - - - - { - FancyZonesSettingsIPCMessage snd = JsonSerializer.Deserialize(msg); - Assert.IsTrue(snd.Powertoys.FancyZones.Properties.FancyzonesVirtualDesktopChangeMoveWindows.Value); - }; - - // act - viewModel.VirtualDesktopChangeMoveWindows = true; - } - [TestMethod] public void AppLastZoneMoveWindows_ShouldSetValue2True_WhenSuccessful() { diff --git a/src/modules/fancyzones/lib/FancyZones.cpp b/src/modules/fancyzones/lib/FancyZones.cpp index 883017257f..6cc83879a5 100644 --- a/src/modules/fancyzones/lib/FancyZones.cpp +++ b/src/modules/fancyzones/lib/FancyZones.cpp @@ -325,7 +325,6 @@ FancyZones::VirtualDesktopChanged() noexcept { // VirtualDesktopChanged is called from a reentrant WinHookProc function, therefore we must postpone the actual logic // until we're in FancyZones::WndProc, which is not reentrant. - std::shared_lock readLock(m_lock); PostMessage(m_window, WM_PRIV_VD_SWITCH, 0, 0); } @@ -694,13 +693,6 @@ void FancyZones::OnDisplayChange(DisplayChangeType changeType) noexcept UpdateWindowsPositions(); } } - else if (changeType == DisplayChangeType::VirtualDesktop) - { - if (m_settings->GetSettings()->virtualDesktopChange_moveWindows) - { - UpdateWindowsPositions(); - } - } } void FancyZones::AddZoneWindow(HMONITOR monitor, PCWSTR deviceId) noexcept diff --git a/src/modules/fancyzones/lib/Settings.cpp b/src/modules/fancyzones/lib/Settings.cpp index c6f8cd0937..7bf469966e 100644 --- a/src/modules/fancyzones/lib/Settings.cpp +++ b/src/modules/fancyzones/lib/Settings.cpp @@ -36,7 +36,7 @@ private: PCWSTR name; bool* value; int resourceId; - } m_configBools[11 /* 12 */] = { // "Turning FLASHING_ZONE option off" + } m_configBools[10 /* 11 */] = { // "Turning FLASHING_ZONE option off" { L"fancyzones_shiftDrag", &m_settings.shiftDrag, IDS_SETTING_DESCRIPTION_SHIFTDRAG }, { L"fancyzones_mouseSwitch", &m_settings.mouseSwitch, IDS_SETTING_DESCRIPTION_MOUSESWITCH }, { L"fancyzones_overrideSnapHotkeys", &m_settings.overrideSnapHotkeys, IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS }, @@ -45,7 +45,6 @@ private: //{ L"fancyzones_zoneSetChange_flashZones", &m_settings.zoneSetChange_flashZones, IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES }, { L"fancyzones_displayChange_moveWindows", &m_settings.displayChange_moveWindows, IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS }, { L"fancyzones_zoneSetChange_moveWindows", &m_settings.zoneSetChange_moveWindows, IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS }, - { L"fancyzones_virtualDesktopChange_moveWindows", &m_settings.virtualDesktopChange_moveWindows, IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS }, { L"fancyzones_appLastZone_moveWindows", &m_settings.appLastZone_moveWindows, IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS }, { L"use_cursorpos_editor_startupscreen", &m_settings.use_cursorpos_editor_startupscreen, IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN }, { L"fancyzones_show_on_all_monitors", &m_settings.showZonesOnAllMonitors, IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS}, diff --git a/src/modules/fancyzones/lib/Settings.h b/src/modules/fancyzones/lib/Settings.h index d4abb961e5..958ea3da1a 100644 --- a/src/modules/fancyzones/lib/Settings.h +++ b/src/modules/fancyzones/lib/Settings.h @@ -9,7 +9,6 @@ struct Settings bool shiftDrag = true; bool mouseSwitch = false; bool displayChange_moveWindows = false; - bool virtualDesktopChange_moveWindows = false; bool zoneSetChange_flashZones = false; bool zoneSetChange_moveWindows = false; bool overrideSnapHotkeys = false; diff --git a/src/modules/fancyzones/lib/fancyzones.rc b/src/modules/fancyzones/lib/fancyzones.rc index 01e98c487b..00b0f2c91f 100644 --- a/src/modules/fancyzones/lib/fancyzones.rc +++ b/src/modules/fancyzones/lib/fancyzones.rc @@ -11,8 +11,7 @@ BEGIN IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS "Override Windows Snap hotkeys (win+arrow) to move windows between zones" IDS_SETTING_DESCRIPTION_MOVE_WINDOW_ACROSS_MONITORS "Move windows between zones across all monitors when snapping with win+arrow" IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS "Keep windows in their zones when the screen resolution changes" - IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS "During zone layout changes, windows assigned to a zone will match new size/positions" - IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS "Keep windows pinned to multiple desktops in the same zone when the active desktop changes" + IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS "During zone layout changes, windows assigned to a zone will match new size/positions" IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES "Flash zones when the active FancyZones layout changes" IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS "Show zones on all monitors while dragging a window" IDS_SETTING_DESCRIPTION_MAKE_DRAGGED_WINDOW_TRANSPARENT "Make dragged window transparent" diff --git a/src/modules/fancyzones/lib/resource.h b/src/modules/fancyzones/lib/resource.h index 95d8f901a7..11dee34949 100644 --- a/src/modules/fancyzones/lib/resource.h +++ b/src/modules/fancyzones/lib/resource.h @@ -5,22 +5,21 @@ #define IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS 105 #define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS 106 #define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES 107 -#define IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS 108 -#define IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS 109 -#define IDS_SETTING_DESCRIPTION_MAKE_DRAGGED_WINDOW_TRANSPARENT 110 -#define IDS_SETTING_DESCRIPTION_ZONECOLOR 111 -#define IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR 112 -#define IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR 113 -#define IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS 114 -#define IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN 115 -#define IDS_SETTING_DESCRIPTION 116 -#define IDS_SETTING_LAUNCH_EDITOR_LABEL 117 -#define IDS_SETTING_LAUNCH_EDITOR_BUTTON 118 -#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 119 -#define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL 120 -#define IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION 121 -#define IDS_SETTINGS_HIGHLIGHT_OPACITY 122 -#define IDS_FANCYZONES 123 -#define IDS_CANT_DRAG_ELEVATED 124 -#define IDS_CANT_DRAG_ELEVATED_LEARN_MORE 125 -#define IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN 126 +#define IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS 108 +#define IDS_SETTING_DESCRIPTION_MAKE_DRAGGED_WINDOW_TRANSPARENT 109 +#define IDS_SETTING_DESCRIPTION_ZONECOLOR 110 +#define IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR 111 +#define IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR 112 +#define IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS 113 +#define IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN 114 +#define IDS_SETTING_DESCRIPTION 115 +#define IDS_SETTING_LAUNCH_EDITOR_LABEL 116 +#define IDS_SETTING_LAUNCH_EDITOR_BUTTON 117 +#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 118 +#define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL 119 +#define IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION 120 +#define IDS_SETTINGS_HIGHLIGHT_OPACITY 121 +#define IDS_FANCYZONES 122 +#define IDS_CANT_DRAG_ELEVATED 123 +#define IDS_CANT_DRAG_ELEVATED_LEARN_MORE 124 +#define IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN 125 diff --git a/src/modules/fancyzones/lib/trace.cpp b/src/modules/fancyzones/lib/trace.cpp index 2d5c22acf5..e8475fd737 100644 --- a/src/modules/fancyzones/lib/trace.cpp +++ b/src/modules/fancyzones/lib/trace.cpp @@ -175,7 +175,6 @@ void Trace::SettingsChanged(const Settings& settings) noexcept TraceLoggingBoolean(settings.shiftDrag, "ShiftDrag"), TraceLoggingBoolean(settings.mouseSwitch, "MouseSwitch"), TraceLoggingBoolean(settings.displayChange_moveWindows, "MoveWindowsOnDisplayChange"), - TraceLoggingBoolean(settings.virtualDesktopChange_moveWindows, "MoveWindowsOnVirtualDesktopChange"), TraceLoggingBoolean(settings.zoneSetChange_flashZones, "FlashZonesOnZoneSetChange"), TraceLoggingBoolean(settings.zoneSetChange_moveWindows, "MoveWindowsOnZoneSetChange"), TraceLoggingBoolean(settings.overrideSnapHotkeys, "OverrideSnapHotKeys"), diff --git a/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp index 7c31818c80..d99201f7f6 100644 --- a/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp @@ -67,7 +67,6 @@ namespace FancyZonesUnitTests ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_flashZones", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES, settings.zoneSetChange_flashZones); ptSettings.add_bool_toogle(L"fancyzones_displayChange_moveWindows", IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS, settings.displayChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_moveWindows", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS, settings.zoneSetChange_moveWindows); - ptSettings.add_bool_toogle(L"fancyzones_virtualDesktopChange_moveWindows", IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS, settings.virtualDesktopChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_appLastZone_moveWindows", IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS, settings.appLastZone_moveWindows); ptSettings.add_bool_toogle(L"use_cursorpos_editor_startupscreen", IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN, settings.use_cursorpos_editor_startupscreen); ptSettings.add_bool_toogle(L"fancyzones_show_on_all_monitors", IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS, settings.showZonesOnAllMonitors); @@ -109,7 +108,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -139,7 +137,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -169,7 +166,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -201,7 +197,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -233,7 +228,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -291,7 +285,6 @@ namespace FancyZonesUnitTests ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_flashZones", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES, settings.zoneSetChange_flashZones); ptSettings.add_bool_toogle(L"fancyzones_displayChange_moveWindows", IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS, settings.displayChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_moveWindows", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS, settings.zoneSetChange_moveWindows); - ptSettings.add_bool_toogle(L"fancyzones_virtualDesktopChange_moveWindows", IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS, settings.virtualDesktopChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_appLastZone_moveWindows", IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS, settings.appLastZone_moveWindows); ptSettings.add_bool_toogle(L"use_cursorpos_editor_startupscreen", IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN, settings.use_cursorpos_editor_startupscreen); ptSettings.add_bool_toogle(L"fancyzones_show_on_all_monitors", IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS, settings.showZonesOnAllMonitors); diff --git a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp index 2d7bb64398..8460783fa3 100644 --- a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp @@ -29,7 +29,6 @@ namespace FancyZonesUnitTests Assert::AreEqual(expected.shiftDrag, actual.shiftDrag); Assert::AreEqual(expected.mouseSwitch, actual.mouseSwitch); Assert::AreEqual(expected.displayChange_moveWindows, actual.displayChange_moveWindows); - Assert::AreEqual(expected.virtualDesktopChange_moveWindows, actual.virtualDesktopChange_moveWindows); Assert::AreEqual(expected.zoneSetChange_flashZones, actual.zoneSetChange_flashZones); Assert::AreEqual(expected.zoneSetChange_moveWindows, actual.zoneSetChange_moveWindows); Assert::AreEqual(expected.overrideSnapHotkeys, actual.overrideSnapHotkeys); @@ -108,7 +107,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -145,7 +143,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -176,7 +173,6 @@ namespace FancyZonesUnitTests .shiftDrag = m_defaultSettings.shiftDrag, .mouseSwitch = m_defaultSettings.mouseSwitch, .displayChange_moveWindows = m_defaultSettings.displayChange_moveWindows, - .virtualDesktopChange_moveWindows = m_defaultSettings.virtualDesktopChange_moveWindows, .zoneSetChange_flashZones = m_defaultSettings.zoneSetChange_flashZones, .zoneSetChange_moveWindows = m_defaultSettings.zoneSetChange_moveWindows, .overrideSnapHotkeys = m_defaultSettings.overrideSnapHotkeys, @@ -220,7 +216,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -251,7 +246,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -283,7 +277,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -316,7 +309,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -430,7 +422,6 @@ namespace FancyZonesUnitTests .shiftDrag = false, .mouseSwitch = false, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = true, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, @@ -452,7 +443,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -574,7 +564,6 @@ namespace FancyZonesUnitTests ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_flashZones", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES, settings.zoneSetChange_flashZones); ptSettings.add_bool_toogle(L"fancyzones_displayChange_moveWindows", IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS, settings.displayChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_zoneSetChange_moveWindows", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS, settings.zoneSetChange_moveWindows); - ptSettings.add_bool_toogle(L"fancyzones_virtualDesktopChange_moveWindows", IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS, settings.virtualDesktopChange_moveWindows); ptSettings.add_bool_toogle(L"fancyzones_appLastZone_moveWindows", IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS, settings.appLastZone_moveWindows); ptSettings.add_bool_toogle(L"use_cursorpos_editor_startupscreen", IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN, settings.use_cursorpos_editor_startupscreen); ptSettings.add_bool_toogle(L"fancyzones_show_on_all_monitors", IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS, settings.showZonesOnAllMonitors); @@ -599,7 +588,6 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_shiftDrag", expected.shiftDrag); values.add_property(L"fancyzones_mouseSwitch", expected.mouseSwitch); values.add_property(L"fancyzones_displayChange_moveWindows", expected.displayChange_moveWindows); - values.add_property(L"fancyzones_virtualDesktopChange_moveWindows", expected.virtualDesktopChange_moveWindows); //values.add_property(L"fancyzones_zoneSetChange_flashZones", expected.zoneSetChange_flashZones); values.add_property(L"fancyzones_zoneSetChange_moveWindows", expected.zoneSetChange_moveWindows); values.add_property(L"fancyzones_overrideSnapHotkeys", expected.overrideSnapHotkeys); @@ -639,7 +627,6 @@ namespace FancyZonesUnitTests //m_ptSettings->add_bool_toogle(L"fancyzones_zoneSetChange_flashZones", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES, expected.zoneSetChange_flashZones); m_ptSettings->add_bool_toogle(L"fancyzones_displayChange_moveWindows", IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS, expected.displayChange_moveWindows); m_ptSettings->add_bool_toogle(L"fancyzones_zoneSetChange_moveWindows", IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS, expected.zoneSetChange_moveWindows); - m_ptSettings->add_bool_toogle(L"fancyzones_virtualDesktopChange_moveWindows", IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS, expected.virtualDesktopChange_moveWindows); m_ptSettings->add_bool_toogle(L"fancyzones_appLastZone_moveWindows", IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS, expected.appLastZone_moveWindows); m_ptSettings->add_bool_toogle(L"use_cursorpos_editor_startupscreen", IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN, expected.use_cursorpos_editor_startupscreen); m_ptSettings->add_bool_toogle(L"fancyzones_show_on_all_monitors", IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS, expected.showZonesOnAllMonitors); @@ -705,7 +692,6 @@ namespace FancyZonesUnitTests .shiftDrag = true, .mouseSwitch = true, .displayChange_moveWindows = true, - .virtualDesktopChange_moveWindows = true, .zoneSetChange_flashZones = false, .zoneSetChange_moveWindows = true, .overrideSnapHotkeys = false, diff --git a/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs b/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs index a7d19a1d99..18d058397c 100644 --- a/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs @@ -309,7 +309,6 @@ namespace PowerToysTests Assert.AreNotEqual(toggleValues[3], GetPropertyValue(savedProps, "fancyzones_moveWindowAcrossMonitors")); Assert.AreNotEqual(toggleValues[4], GetPropertyValue(savedProps, "fancyzones_displayChange_moveWindows")); Assert.AreNotEqual(toggleValues[5], GetPropertyValue(savedProps, "fancyzones_zoneSetChange_moveWindows")); - Assert.AreNotEqual(toggleValues[6], GetPropertyValue(savedProps, "fancyzones_virtualDesktopChange_moveWindows")); Assert.AreNotEqual(toggleValues[7], GetPropertyValue(savedProps, "fancyzones_appLastZone_moveWindows")); Assert.AreNotEqual(toggleValues[8], GetPropertyValue(savedProps, "use_cursorpos_editor_startupscreen")); Assert.AreNotEqual(toggleValues[9], GetPropertyValue(savedProps, "fancyzones_show_on_all_monitors")); @@ -349,7 +348,6 @@ namespace PowerToysTests Assert.AreEqual(toggleValues[3], GetPropertyValue(savedProps, "fancyzones_moveWindowAcrossMonitors")); Assert.AreEqual(toggleValues[4], GetPropertyValue(savedProps, "fancyzones_displayChange_moveWindows")); Assert.AreEqual(toggleValues[5], GetPropertyValue(savedProps, "fancyzones_zoneSetChange_moveWindows")); - Assert.AreEqual(toggleValues[6], GetPropertyValue(savedProps, "fancyzones_virtualDesktopChange_moveWindows")); Assert.AreEqual(toggleValues[7], GetPropertyValue(savedProps, "fancyzones_appLastZone_moveWindows")); Assert.AreEqual(toggleValues[8], GetPropertyValue(savedProps, "use_cursorpos_editor_startupscreen")); Assert.AreEqual(toggleValues[9], GetPropertyValue(savedProps, "fancyzones_show_on_all_monitors")); diff --git a/src/tests/win-app-driver/PowerToysSession.cs b/src/tests/win-app-driver/PowerToysSession.cs index 66bc8e14e1..23c4caa8b2 100644 --- a/src/tests/win-app-driver/PowerToysSession.cs +++ b/src/tests/win-app-driver/PowerToysSession.cs @@ -26,7 +26,7 @@ namespace PowerToysTests protected static string _initialSettings = ""; protected static string _initialZoneSettings = ""; - protected const string _defaultSettings = "{\"version\":\"1.0\",\"name\":\"FancyZones\",\"properties\":{\"fancyzones_shiftDrag\":{\"value\":true},\"fancyzones_mouseSwitch\":{\"value\":false},\"fancyzones_overrideSnapHotkeys\":{\"value\":false},\"fancyzones_moveWindowAcrossMonitors\":{\"value\":false},\"fancyzones_zoneSetChange_flashZones\":{\"value\":false},\"fancyzones_displayChange_moveWindows\":{\"value\":false},\"fancyzones_zoneSetChange_moveWindows\":{\"value\":false},\"fancyzones_virtualDesktopChange_moveWindows\":{\"value\":false},\"fancyzones_appLastZone_moveWindows\":{\"value\":false},\"use_cursorpos_editor_startupscreen\":{\"value\":true},\"fancyzones_zoneHighlightColor\":{\"value\":\"#0078D7\"},\"fancyzones_highlight_opacity\":{\"value\":90},\"fancyzones_editor_hotkey\":{\"value\":{\"win\":true,\"ctrl\":false,\"alt\":false,\"shift\":false,\"code\":192,\"key\":\"`\"}},\"fancyzones_excluded_apps\":{\"value\":\"\"}}}"; + protected const string _defaultSettings = "{\"version\":\"1.0\",\"name\":\"FancyZones\",\"properties\":{\"fancyzones_shiftDrag\":{\"value\":true},\"fancyzones_mouseSwitch\":{\"value\":false},\"fancyzones_overrideSnapHotkeys\":{\"value\":false},\"fancyzones_moveWindowAcrossMonitors\":{\"value\":false},\"fancyzones_zoneSetChange_flashZones\":{\"value\":false},\"fancyzones_displayChange_moveWindows\":{\"value\":false},\"fancyzones_zoneSetChange_moveWindows\":{\"value\":false},\"fancyzones_appLastZone_moveWindows\":{\"value\":false},\"use_cursorpos_editor_startupscreen\":{\"value\":true},\"fancyzones_zoneHighlightColor\":{\"value\":\"#0078D7\"},\"fancyzones_highlight_opacity\":{\"value\":90},\"fancyzones_editor_hotkey\":{\"value\":{\"win\":true,\"ctrl\":false,\"alt\":false,\"shift\":false,\"code\":192,\"key\":\"`\"}},\"fancyzones_excluded_apps\":{\"value\":\"\"}}}"; protected const string _defaultZoneSettings = "{\"app-zone-history\":[],\"devices\":[],\"custom-zone-sets\":[]}";