Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Settings] Minor UI fixes (#18227)

Browse Source 
* Fix wrapping

* Fix margin

* Fix IsEnabled

* Update ShortcutGuidePage.xaml
This commit is contained in:
Niels Laute
2022-05-19 15:07:45 +02:00
committed by GitHub
parent ffa20c0073
commit ab4328310c
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings-ui/Settings.UI/Controls/CheckBoxWithDescriptionControl.cs
View File

@@ -40,12 +40,12 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
// Add text box only if the description is not empty. Required for additional plugin options. // Add text box only if the description is not empty. Required for additional plugin options.
if (!string.IsNullOrWhiteSpace(Description)) if (!string.IsNullOrWhiteSpace(Description))
{ {
panel.Children.Add(new TextBlock() { Margin = new Thickness(0, 10, 0, 0), Text = Header }); panel.Children.Add(new TextBlock() { Margin = new Thickness(0, 10, 0, 0), Text = Header, TextWrapping = TextWrapping.WrapWholeWords });
panel.Children.Add(new IsEnabledTextBlock() { Style = (Style)App.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description }); panel.Children.Add(new IsEnabledTextBlock() { Style = (Style)App.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description });
} }
else else
{ {
panel.Children.Add(new TextBlock() { Margin = new Thickness(0, 0, 0, 0), Text = Header }); panel.Children.Add(new TextBlock() { Margin = new Thickness(0, 0, 0, 0), Text = Header, TextWrapping = TextWrapping.WrapWholeWords });
} }
_checkBoxSubTextControl.Content = panel; _checkBoxSubTextControl.Content = panel;

2
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -2085,7 +2085,7 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="AlwaysOnTop_Radio_Windows_Default.Content" xml:space="preserve"> <data name="AlwaysOnTop_Radio_Windows_Default.Content" xml:space="preserve">
<value>Windows default</value> <value>Windows default</value>
</data> </data>
<data name="PowerPreviewPage.SecondaryLinksHeader" xml:space="preserve"> <data name="FileExplorerPreview.SecondaryLinksHeader" xml:space="preserve">
<value>Attribution</value> <value>Attribution</value>
<comment>giving credit to the projects this utility was based on</comment> <comment>giving credit to the projects this utility was based on</comment>
</data> </data>

1
src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml
View File

@@ -130,6 +130,7 @@
ScrollViewer.VerticalScrollMode="Enabled" ScrollViewer.VerticalScrollMode="Enabled"
ScrollViewer.IsVerticalRailEnabled="True" ScrollViewer.IsVerticalRailEnabled="True"
TextWrapping="Wrap" TextWrapping="Wrap"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}"
AcceptsReturn="True" AcceptsReturn="True"
MinWidth="240" MinWidth="240"
MinHeight="160" /> MinHeight="160" />

2
src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -257,7 +257,7 @@
<Rectangle Style="{StaticResource ExpanderSeparatorStyle}" /> <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
<controls:CheckBoxWithDescriptionControl Header="{x:Bind Path=DisplayLabel}" Description="{x:Bind Path=DisplayDescription}" <controls:CheckBoxWithDescriptionControl Header="{x:Bind Path=DisplayLabel}" Description="{x:Bind Path=DisplayDescription}"
IsChecked="{x:Bind Path=Value, Mode=TwoWay}" IsChecked="{x:Bind Path=Value, Mode=TwoWay}"
Margin="{StaticResource ExpanderSettingMargin}"/> Margin="56, 0, 40, 16"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>