mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 20:59:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Settings] ColorPicker spacing issue (#9215)

Browse Source 
* Added additional text header

* Margin fix

* Margin fix

Co-authored-by: Niels Laute <niels9001@hotmail.com>
This commit is contained in:
Niels Laute 2021-01-22 15:03:16 +01:00 committed by GitHub
parent eed89eff45
commit 2b42fb8a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -837,7 +837,7 @@
<value>Activation behavior</value>
</data>
<data name="ColorFormats.Text" xml:space="preserve">
<value>Color formats</value>
<value>Picker behavior</value>
</data>
<data name="KBM_KeysCannotBeRemapped.Text" xml:space="preserve">
<value>Learn more about remapping limitations</value>
@ -928,4 +928,7 @@
<value>https://aka.ms/PowerToysOverview_ShortcutGuide</value>
<comment>URL. Do not loc</comment>
</data>
</root>
<data name="ColorPicker_Editor.Text" xml:space="preserve">
<value>Editor</value>
</data>
</root>

17
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@ -133,15 +133,20 @@
SelectedValuePath="Key" />
<CheckBox x:Uid="ColorPicker_ShowColorName"
IsChecked="{Binding ShowColorName, Mode=TwoWay}"
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{Binding IsEnabled}"/>
IsChecked="{Binding ShowColorName, Mode=TwoWay}"
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{Binding IsEnabled}"/>
<TextBlock x:Uid="ColorPicker_Editor"
Style="{StaticResource SettingsGroupTitleStyle}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}" />
<TextBlock Margin="{StaticResource MediumTopMargin}"
x:Name="ColorFormatsListViewLabel"
<TextBlock x:Name="ColorFormatsListViewLabel"
TextWrapping="WrapWholeWords"
x:Uid="ColorPicker_ColorFormatsDescription"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
Margin="{StaticResource SmallTopMargin}"/>
<ListView ItemsSource="{Binding ColorFormats, Mode=TwoWay}"
AllowDrop="True"
MaxWidth="466"