mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-12 18:29:24 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Settings] UX improvements to the FancyZones config page (#3658)

Browse Source
This commit is contained in:
Niels Laute 2020-05-25 11:47:32 +02:00 committed by GitHub
parent 791518d6c4
commit d047e95bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -284,8 +284,8 @@
<data name="FancyZones_KeepWindowsPinned.Content" xml:space="preserve"> <data name="FancyZones_KeepWindowsPinned.Content" xml:space="preserve">
<value>Keep windows pinned to multiple desktops in the same zone when the active desktop changes</value> <value>Keep windows pinned to multiple desktops in the same zone when the active desktop changes</value>
</data> </data>
<data name="FancyZones_LaunchEditorButtonControl_Header.Content" xml:space="preserve"> <data name="FancyZones_LaunchEditorButtonControl.Text" xml:space="preserve">
<value>Launch Zones Editor</value> <value>Launch zones editor</value>
</data> </data>
<data name="FancyZones_MakeDraggedWindowTransparentCheckBoxControl.Content" xml:space="preserve"> <data name="FancyZones_MakeDraggedWindowTransparentCheckBoxControl.Content" xml:space="preserve">
<value>Make dragged window transparent</value> <value>Make dragged window transparent</value>
@ -318,7 +318,7 @@
<value>Zone behavior</value> <value>Zone behavior</value>
</data> </data>
<data name="FancyZones_ZoneHighlightColor.Text" xml:space="preserve"> <data name="FancyZones_ZoneHighlightColor.Text" xml:space="preserve">
<value>Zone highlight color (default: #0078D7)</value> <value>Zone highlight color (Default: #0078D7)</value>
</data> </data>
<data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve"> <data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve">
<value>During zone layout changes, windows assigned to a zone will match new size/positions</value> <value>During zone layout changes, windows assigned to a zone will match new size/positions</value>
@ -408,10 +408,10 @@
<value>Enable auto-complete and auto-suggest of recently used list for autocomplete dropdown</value> <value>Enable auto-complete and auto-suggest of recently used list for autocomplete dropdown</value>
</data> </data>
<data name="FancyZones_BorderColor.Text" xml:space="preserve"> <data name="FancyZones_BorderColor.Text" xml:space="preserve">
<value>Zone border color (Default #FFFFFF)</value> <value>Zone border color (Default: #FFFFFF)</value>
</data> </data>
<data name="FancyZones_InActiveColor.Text" xml:space="preserve"> <data name="FancyZones_InActiveColor.Text" xml:space="preserve">
<value>Zone inactive color (Default #F5FCFF)</value> <value>Zone inactive color (Default: #F5FCFF)</value>
</data> </data>
<data name="FancyZones_SaveBorderColor.Content" xml:space="preserve"> <data name="FancyZones_SaveBorderColor.Content" xml:space="preserve">
<value>Save Zone Border Color Choice</value> <value>Save Zone Border Color Choice</value>

64
src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@ -55,22 +55,27 @@
IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
Margin="{StaticResource MediumTopMargin}" /> Margin="{StaticResource MediumTopMargin}" />
<TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings" <Button Margin="{StaticResource MediumTopMargin}"
Style="{StaticResource SettingsGroupTitleStyle}"
/>
<Button x:Uid="FancyZones_LaunchEditorButtonControl_Header"
Margin="{StaticResource SmallTopMargin}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
Command = "{Binding LaunchEditorEventHandler, Source={StaticResource eventViewModel}}" Command = "{Binding LaunchEditorEventHandler, Source={StaticResource eventViewModel}}"
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}">
<StackPanel Orientation="Horizontal">
<Viewbox Height="12" Width="12">
<PathIcon Data="M896 0v896H0V0h896zM768 768V128H128v640h640zM0 1920v-896h1920v896H0zm128-768v640h1664v-640H128zM1024 0h896v896h-896V0zm768 768V128h-640v640h640z"/>
</Viewbox>
<TextBlock Margin="12,0,0,0" x:Uid="FancyZones_LaunchEditorButtonControl"/>
</StackPanel>
</Button>
<TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings"
Style="{StaticResource SettingsGroupTitleStyle}"
/> />
<CustomControls:HotkeySettingsControl <CustomControls:HotkeySettingsControl
x:Uid="FancyZones_HokeyEditorControl_Header" x:Uid="FancyZones_HokeyEditorControl_Header"
Width="320" Width="320"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="{StaticResource MediumTopMargin}" Margin="{StaticResource SmallTopMargin}"
HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}" HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}"
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
/> />
@ -151,6 +156,14 @@
Style="{StaticResource BodyTextBlockStyle}" Style="{StaticResource BodyTextBlockStyle}"
Margin="{StaticResource SmallTopMargin}" /> Margin="{StaticResource SmallTopMargin}" />
<muxc:DropDownButton Margin="0,4,0,0" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}" Padding="4,4,8,4">
<Border Width="48" CornerRadius="2" Height="24">
<Border.Background>
<SolidColorBrush Color="{Binding Path=ZoneHighlightColor, Mode=TwoWay}"/>
</Border.Background>
</Border>
<muxc:DropDownButton.Flyout>
<Flyout>
<muxc:ColorPicker x:Name="FancyZones_ZoneHighlightColor" <muxc:ColorPicker x:Name="FancyZones_ZoneHighlightColor"
Margin="0,6,0,0" Margin="0,6,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -162,12 +175,25 @@
IsAlphaSliderVisible="False" IsAlphaSliderVisible="False"
IsAlphaTextInputVisible="False" IsAlphaTextInputVisible="False"
Color="{Binding Path=ZoneHighlightColor, Mode=TwoWay}" Color="{Binding Path=ZoneHighlightColor, Mode=TwoWay}"
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/> />
</Flyout>
</muxc:DropDownButton.Flyout>
</muxc:DropDownButton>
<TextBlock x:Uid="FancyZones_InActiveColor" <TextBlock x:Uid="FancyZones_InActiveColor"
Style="{StaticResource BodyTextBlockStyle}" Style="{StaticResource BodyTextBlockStyle}"
Margin="{StaticResource SmallTopMargin}" /> Margin="{StaticResource SmallTopMargin}" />
<muxc:DropDownButton Margin="0,4,0,0" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}" Padding="4,4,8,4">
<Border Width="48" CornerRadius="2" Height="24">
<Border.Background>
<SolidColorBrush Color="{Binding Path=ZoneInActiveColor, Mode=TwoWay}"/>
</Border.Background>
</Border>
<muxc:DropDownButton.Flyout>
<Flyout>
<muxc:ColorPicker x:Name="FancyZones_InActiveColorPicker" <muxc:ColorPicker x:Name="FancyZones_InActiveColorPicker"
Margin="0,6,0,0" Margin="0,6,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -178,13 +204,25 @@
IsAlphaEnabled="False" IsAlphaEnabled="False"
IsAlphaSliderVisible="False" IsAlphaSliderVisible="False"
IsAlphaTextInputVisible="False" IsAlphaTextInputVisible="False"
Color="{Binding Path=ZoneInActiveColor, Mode=TwoWay}" Color="{Binding Path=ZoneInActiveColor, Mode=TwoWay}"/>
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/> </Flyout>
</muxc:DropDownButton.Flyout>
</muxc:DropDownButton>
<TextBlock x:Uid="FancyZones_BorderColor" <TextBlock x:Uid="FancyZones_BorderColor"
Style="{StaticResource BodyTextBlockStyle}" Style="{StaticResource BodyTextBlockStyle}"
Margin="{StaticResource SmallTopMargin}" /> Margin="{StaticResource SmallTopMargin}" />
<muxc:DropDownButton Margin="0,4,0,0" IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}" Padding="4,4,8,4">
<Border Width="48" CornerRadius="2" Height="24">
<Border.Background>
<SolidColorBrush Color="{Binding Path=ZoneBorderColor, Mode=TwoWay}"/>
</Border.Background>
</Border>
<muxc:DropDownButton.Flyout>
<Flyout>
<muxc:ColorPicker x:Name="FancyZones_BorderColor" <muxc:ColorPicker x:Name="FancyZones_BorderColor"
Margin="0,6,0,0" Margin="0,6,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -197,7 +235,9 @@
IsAlphaTextInputVisible="False" IsAlphaTextInputVisible="False"
Color="{Binding Path=ZoneBorderColor, Mode=TwoWay}" Color="{Binding Path=ZoneBorderColor, Mode=TwoWay}"
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/> IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/>
</Flyout>
</muxc:DropDownButton.Flyout>
</muxc:DropDownButton>
<TextBlock x:Uid="FancyZones_ExcludeApps" <TextBlock x:Uid="FancyZones_ExcludeApps"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>