Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FancyZones] Fix #25353 setting page bouncing #28995

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −35
Draft

[FancyZones] Fix #25353 setting page bouncing #28995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand Down
22 changes: 4 additions & 18 deletions src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should all of them begin with a capital letter?

</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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

</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>
Expand Down