Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 18:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust font: size family; few corner-radii (#25358)

Browse Source 
* SettingsCard ActionIcon 16

* Font Family + Size

* CornerRadius

* Misc

* extras

* Revert size 16 - 14

To be dealt with via Community

* other improvs

* other improvs

* try to adjust height to fit text

* adjust Border sizes to fit text

* undo
This commit is contained in:
Jay
2023-05-09 16:40:18 +02:00
committed by GitHub
parent 39ea16a7e7
commit 5aed67bc0d
17 changed files with 128 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml
View File

@@ -42,8 +42,8 @@
x:Key="DefaultBorderBrush"
Color="{ThemeResource SystemAccentColor}" />
</ResourceDictionary>
</UserControl.Resources>
<Grid
x:Name="RootGrid"
MinWidth="170"
@@ -51,38 +51,34 @@
HorizontalAlignment="Center"
Background="Black"
BorderBrush="Black"
BorderThickness="6"
CornerRadius="4">
BorderThickness="8"
CornerRadius="12">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border
Grid.RowSpan="3"
Grid.RowSpan="2"
Grid.ColumnSpan="2"
CornerRadius="2"
Opacity="0.8">
Opacity="0.8"
CornerRadius="4">
<Image
AutomationProperties.AccessibilityView="Raw"
AutomationProperties.AccessibilityView="Raw"
Source="{x:Bind WallpaperPath, Mode=OneWay}"
Stretch="UniformToFill" />
</Border>
<Grid
Grid.Row="2"
Grid.ColumnSpan="2"
Background="{ThemeResource SystemControlAcrylicElementBrush}" />
<Border
x:Name="Zone1"
Grid.RowSpan="2"
Margin="4,4,2,4"
BorderThickness="1"
CornerRadius="2">
Margin="4,4,2,4"
CornerRadius="2"
Background="{ThemeResource SystemControlAcrylicElementBrush}">
<TextBlock
x:Name="Zone1Number"
HorizontalAlignment="Center"
@@ -94,9 +90,10 @@
<Border
x:Name="Zone2"
Grid.Column="1"
Margin="2,4,4,2"
BorderThickness="1"
CornerRadius="2">
Margin="2,4,4,2"
CornerRadius="2"
Background="{ThemeResource SystemControlAcrylicElementBrush}">
<TextBlock
x:Name="Zone2Number"
HorizontalAlignment="Center"
@@ -109,9 +106,10 @@
x:Name="Zone3"
Grid.Row="1"
Grid.Column="1"
Margin="2,2,4,4"
BorderThickness="1"
CornerRadius="2">
Margin="2,2,4,4"
CornerRadius="2"
Background="{ThemeResource SystemControlAcrylicElementBrush}">
<TextBlock
x:Name="Zone3Number"
HorizontalAlignment="Center"

2
src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml
View File

@@ -44,7 +44,7 @@
</ItemsControl>
<FontIcon
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="14"
FontSize="16"
Glyph="&#xE70F;" />
</StackPanel>
</Button>

6
src/settings-ui/Settings.UI/Flyout/LaunchPage.xaml
View File

@@ -122,7 +122,7 @@
<ToolTipService.ToolTip>
<TextBlock x:Uid="DocsTooltip"/>
</ToolTipService.ToolTip>
<FontIcon FontSize="14" Glyph="&#xE130;" />
<FontIcon FontSize="16" Glyph="&#xE8A5;" />
</Button>
<Button
x:Name="ReportBugBtn"
@@ -132,7 +132,7 @@
<ToolTipService.ToolTip>
<TextBlock x:Uid="BugReportTooltip"/>
</ToolTipService.ToolTip>
<FontIcon FontSize="14" Glyph="&#xebe8;" />
<FontIcon FontSize="16" Glyph="&#xebe8;" />
</Button>
<Button
x:Name="SettingsBtn"
@@ -158,7 +158,7 @@
Style="{StaticResource FlyoutButtonStyle}"
ToolTipService.ToolTip="Quit"
Click="QuitButton_Click">
<FontIcon FontSize="14" Glyph="&#xe894;" />
<FontIcon FontSize="16" Glyph="&#xe894;" />
</Button>-->
</StackPanel>
</Grid>

8
src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
View File

@@ -35,7 +35,9 @@
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<labs:SettingsCard
x:Uid="FancyZones_LaunchEditorButtonControl"
ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, FontSize=14, Glyph=&#xE8A7;}"
ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
FontSize=14,
Glyph=&#xE8A7;}"
Command="{x:Bind ViewModel.LaunchEditorEventHandler}"
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
IsClickEnabled="True" />
@@ -115,8 +117,8 @@
<labs:SettingsExpander.Items>
<labs:SettingsCard ContentAlignment="Left">
<controls:FancyZonesPreviewControl
Width="170"
Height="86"
Width="192"
Height="108"
CustomBorderColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=OneWay}"
CustomHighlightColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=OneWay}"
CustomInActiveColor="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=OneWay}"

15
src/settings-ui/Settings.UI/Views/GeneralPage.xaml
View File

@@ -243,15 +243,11 @@
Spacing="8">
<TextBlock
x:Name="pathTextBlock"
Width="350"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="12"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}"
TextAlignment="Right"
TextTrimming="CharacterEllipsis">
TextTrimming="CharacterEllipsis"
Foreground="{ThemeResource TextFillColorSecondaryBrush}">
<ToolTipService.ToolTip>
<ToolTip IsEnabled="{Binding ElementName=pathTextBlock, Path=IsTextTrimmed}">
<TextBlock Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" />
@@ -274,14 +270,9 @@
x:Uid="General_SettingsBackupAndRestoreStatusInfo"
HorizontalContentAlignment="Left"
ContentAlignment="Vertical">
<labs:SettingsCard.Resources>
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="12" />
</Style>
</labs:SettingsCard.Resources>
<Grid Margin="0,0,0,6" ColumnSpacing="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" MinWidth="{StaticResource SettingActionControlMinWidth}"/>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>