[FancyZones] Fix microsoft#25353 setting page bouncing

quyenvsp · Oct 3, 2023 · ce024e4 · ce024e4
1 parent 1de6c7d
commit ce024e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 35 deletions.
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -189,24 +189,9 @@
  <controls:SettingsCard x:Uid="FancyZones_MoveWindow" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}">
  <ComboBox
  MinWidth="{StaticResource SettingActionControlMinWidth}"
- MinHeight="56"
  SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition, Converter={StaticResource BoolToComboBoxIndexConverter}}">
- <ComboBoxItem x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible">
- <StackPanel Orientation="Vertical" Spacing="4">
- <custom:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex" />
- <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
- <Run x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description" />
- </TextBlock>
- </StackPanel>
- </ComboBoxItem>
- <ComboBoxItem x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Accessible">
- <StackPanel Orientation="Vertical" Spacing="4">
- <custom:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowBasedOnRelativePosition" />
- <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
- <Run x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Description" />
- </TextBlock>
- </StackPanel>
- </ComboBoxItem>
+ <ComboBoxItem x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible" />
+ <ComboBoxItem x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Accessible" />
  </ComboBox>
  </controls:SettingsCard>
  <controls:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}">

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -1781,29 +1781,15 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
  <value>Small</value>
  <comment>The size of the image</comment>
  </data>
- <data name="FancyZones_MoveWindowBasedOnRelativePosition_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
- <value>Windows key + Up, down, left or right arrow key to move windows based on relative position</value>
+ <data name="FancyZones_MoveWindowBasedOnRelativePosition_Accessible.Content" xml:space="preserve">
+ <value>Windows key + Up, down, left or right based on relative position</value>
  </data>
- <data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
- <value>Windows key + Left or right arrow keys to move windows based on zone index</value>
- </data>
- <data name="FancyZones_MoveWindowBasedOnRelativePosition_Description.Text" xml:space="preserve">
- <value>Windows key +    or </value>
- <comment>Do not loc the icons (hex numbers)</comment>
- </data>
- <data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description.Text" xml:space="preserve">
- <value>Windows key +  or </value>
- <comment>Do not loc the icons (hex numbers)</comment>
- </data>
- <data name="FancyZones_MoveWindowBasedOnRelativePosition.Text" xml:space="preserve">
- <value>Relative position</value>
+ <data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible.Content" xml:space="preserve">
+ <value>Windows key + Left or right based on zone index</value>
  </data>
  <data name="FancyZones_MoveWindow.Header" xml:space="preserve">
  <value>Move windows based on</value>
  </data>
- <data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex.Text" xml:space="preserve">
- <value>Zone index</value>
- </data>
  <data name="ColorPicker_Editor.Header" xml:space="preserve">
  <value>Color formats</value>
  </data>