Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 20:57:22 +02:00
Code Issues 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
2 changed files with 16 additions and 8 deletions
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> <value>Activation behavior</value>
</data> </data>
<data name="ColorFormats.Text" xml:space="preserve"> <data name="ColorFormats.Text" xml:space="preserve">
<value>Color formats</value> <value>Picker behavior</value>
</data> </data>
<data name="KBM_KeysCannotBeRemapped.Text" xml:space="preserve"> <data name="KBM_KeysCannotBeRemapped.Text" xml:space="preserve">
<value>Learn more about remapping limitations</value> <value>Learn more about remapping limitations</value>
@@ -928,4 +928,7 @@
<value>https://aka.ms/PowerToysOverview_ShortcutGuide</value> <value>https://aka.ms/PowerToysOverview_ShortcutGuide</value>
<comment>URL. Do not loc</comment> <comment>URL. Do not loc</comment>
</data> </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" /> SelectedValuePath="Key" />
<CheckBox x:Uid="ColorPicker_ShowColorName" <CheckBox x:Uid="ColorPicker_ShowColorName"
IsChecked="{Binding ShowColorName, Mode=TwoWay}" IsChecked="{Binding ShowColorName, Mode=TwoWay}"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
IsEnabled="{Binding IsEnabled}"/> 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}" <TextBlock x:Name="ColorFormatsListViewLabel"
x:Name="ColorFormatsListViewLabel"
TextWrapping="WrapWholeWords" TextWrapping="WrapWholeWords"
x:Uid="ColorPicker_ColorFormatsDescription" 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}" <ListView ItemsSource="{Binding ColorFormats, Mode=TwoWay}"
AllowDrop="True" AllowDrop="True"
MaxWidth="466" MaxWidth="466"