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

2
src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
View File

@@ -43,7 +43,7 @@
ui:ControlHelper.CornerRadius="64"
Margin="0,8,0,0"
Style="{StaticResource AccentButtonStyle}"
FontFamily="Segoe MDL2 Assets"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Content=""
FontSize="24"
TabIndex="0"

4
src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
View File

@@ -161,7 +161,7 @@
<Run x:Name="WidthLabel" />
<Run Text="&#xE947;"
FontSize="10"
FontFamily="Segoe MDL2 Assets" />
FontFamily="{StaticResource SymbolThemeFontFamily}" />
<Run x:Name="HeightLabel" />
</TextBlock>
</DockPanel>
@@ -189,7 +189,7 @@
Focusable="False"
Grid.Row="2"
Grid.Column="2"
FontFamily="Segoe MDL2 Assets"
FontFamily="{StaticResource SymbolThemeFontFamily}"
HorizontalAlignment="Right"
VerticalAlignment="Top" Style="{DynamicResource CloseButtonStyle}"/>

4
src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml
View File

@@ -21,7 +21,7 @@
</Canvas.Effect>
<StackPanel x:Name="MergeButtons"
Orientation="Horizontal">
<Border CornerRadius="2"
<Border CornerRadius="4"
Background="{DynamicResource PrimaryBackgroundBrush}">
<Button Width="134"
@@ -31,7 +31,7 @@
Click="MergeClick">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE746;"
FontFamily="Segoe MDL2 Assets"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Foreground="{DynamicResource PrimaryForegroundBrush}"
Margin="0,3,8,0" />
<TextBlock Text="{x:Static props:Resources.Merge_zones}"

12
src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
View File

@@ -28,20 +28,18 @@
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="ID"
FontSize="68"
FontWeight="SemiBold"
FontSize="64"
Foreground="{DynamicResource PrimaryForegroundBrush}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource SecondaryForegroundBrush}"
DockPanel.Dock="Bottom"
FontWeight="SemiBold"
DockPanel.Dock="Bottom"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Run x:Name="WidthLabel" />
<Run Text="&#xe894;"
FontSize="10"
FontFamily="Segoe MDL2 Assets" />
<Run x:Name="HeightLabel" />
<Run x:Name="WidthLabel" />
<Run Text="×" />
<Run x:Name="HeightLabel" />
</TextBlock>
</DockPanel>

94
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
View File

@@ -26,7 +26,7 @@
Closing="OnClosing"
ResizeMode="CanResize">
<Window.Resources>
<Thickness x:Key="ContentDialogPadding">24,18,0,24</Thickness>
<Thickness x:Key="ContentDialogPadding">24,16,0,24</Thickness>
<Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,24,0</Thickness>
<Converters:LayoutModelTypeToVisibilityConverter x:Key="LayoutModelTypeToVisibilityConverter" />
<Converters:LayoutTypeCustomToVisibilityConverter x:Key="LayoutTypeCustomToVisibilityConverter" />
@@ -74,7 +74,7 @@
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
<DataTemplate x:Key="MonitorItemTemplate">
<Border x:Name="MonitorItem"
Width="{Binding DisplayWidth}"
@@ -95,10 +95,8 @@
<StackPanel Orientation="Vertical"
VerticalAlignment="Center">
<TextBlock Name="IndexText"
TextTrimming="CharacterEllipsis"
Text="{Binding Index}"
FontSize="26"
Grid.Row="0"
FontSize="28"
FontWeight="SemiBold"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -106,25 +104,19 @@
<TextBlock Name="ResolutionText"
TextTrimming="CharacterEllipsis"
Text="{Binding Dimensions}"
Grid.Row="0"
Margin="0,0,0,0"
FontSize="11"
FontWeight="SemiBold"
FontSize="12"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
<TextBlock Name="ScalingText"
TextTrimming="CharacterEllipsis"
Text="{Binding Scaling}"
Margin="0,0,0,0"
FontSize="8"
FontSize="12"
HorizontalAlignment="Center"
Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
</StackPanel>
</Border>
</DataTemplate>
<DataTemplate x:Key="LayoutItemTemplate">
<Grid Background="Transparent">
<Grid Width="180"
@@ -138,7 +130,7 @@
<TextBlock Name="layoutName"
TextTrimming="CharacterEllipsis"
Text="{Binding Name}"
FontSize="15"
FontSize="16"
FontWeight="SemiBold"
Margin="0,0,24,0"
ToolTip="{Binding Name}"
@@ -168,8 +160,8 @@
ui:ControlHelper.CornerRadius="36">
<Button.Content>
<TextBlock Text="&#xE70F;"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
AutomationProperties.Name="{x:Static props:Resources.Edit}" />
</Button.Content>
</Button>
@@ -294,7 +286,7 @@
Margin="8">
<TextBlock Text="&#xE710;"
AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
FontFamily="Segoe MDL2 Assets"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
Foreground="{DynamicResource AccentButtonForeground}" />
<TextBlock Text="{x:Static props:Resources.Create_new_layout}"
Margin="12,-3,0,0"
@@ -351,7 +343,7 @@
Style="{StaticResource IconOnlyButtonStyle}">
<Button.Content>
<TextBlock Text="&#xe713;"
FontFamily="Segoe MDL2 Assets"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
AutomationProperties.Name="{x:Static props:Resources.OpenSettings}" />
</Button.Content>
</Button>
@@ -384,11 +376,11 @@
AutomationProperties.Name="{x:Static props:Resources.Duplicate}"
ToolTip="{x:Static props:Resources.Duplicate}"
Style="{StaticResource IconOnlyButtonStyle}"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
<Button.Content>
<TextBlock Text="&#xE8C8;"
FontFamily="Segoe MDL2 Assets"
<TextBlock Text="&#xE8C8;"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
AutomationProperties.Name="{x:Static props:Resources.Duplicate}" />
</Button.Content>
</Button>
@@ -401,22 +393,24 @@
Style="{StaticResource IconOnlyButtonStyle}"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
<Button.Content>
<TextBlock Text="&#xE8C8;"
FontFamily="Segoe MDL2 Assets"
<TextBlock Text="&#xE8C8;"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}" />
</Button.Content>
</Button>
<Button Click="DeleteLayout_Click"
x:Name="deleteLayoutButton"
AutomationProperties.Name="{x:Static props:Resources.Delete}"
ToolTip="{x:Static props:Resources.Delete}"
Style="{StaticResource IconOnlyButtonStyle}"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
<Button Click="DeleteLayout_Click"
x:Name="deleteLayoutButton"
AutomationProperties.Name="{x:Static props:Resources.Delete}"
ToolTip="{x:Static props:Resources.Delete}"
Style="{StaticResource IconOnlyButtonStyle}"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
<Button.Content>
<TextBlock Text="&#xE74D;"
FontFamily="Segoe MDL2 Assets"
Foreground="#c50500"
<TextBlock Text="&#xE74D;"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
Foreground="#C42B1C"
AutomationProperties.Name="{x:Static props:Resources.Delete}" />
</Button.Content>
</Button>
@@ -428,7 +422,7 @@
HorizontalAlignment="Stretch"
Visibility="{Binding IsCustom, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
ToolTip="{x:Static props:Resources.Name}"
FontSize="16"
VerticalAlignment="Bottom" Margin="0,0,0,8"
@@ -456,7 +450,7 @@
Orientation="Horizontal">
<TextBlock x:Name="QuickKeyTitle"
Text="{x:Static props:Resources.QuickKey_Title}" />
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
Margin="8,4,0,0"
Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
Text="&#xE946;"
@@ -468,7 +462,7 @@
<StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
VerticalAlignment="Center"
FontSize="16"
ToolTip="{x:Static props:Resources.QuickKey_Title}"
@@ -496,8 +490,8 @@
<Button Content="&#xE70F;"
x:Name="editZoneLayoutButton"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Height="36"
@@ -520,7 +514,7 @@
Margin="0,16,0,0"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
VerticalAlignment="Center"
FontSize="16"
Margin="0,16,0,0"
@@ -573,7 +567,7 @@
Margin="28,0,0,4"
TextWrapping="Wrap" />
<StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
VerticalAlignment="Center"
FontSize="16"
AutomationProperties.Name="{x:Static props:Resources.Space_Around_Zones}"
@@ -633,7 +627,7 @@
Margin="28,0,0,4"
TextWrapping="Wrap" />
<StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets"
<TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
VerticalAlignment="Center"
FontSize="16"
ToolTip="{x:Static props:Resources.Distance_adjacent_zones}"
@@ -683,8 +677,8 @@
Visibility="{Binding CanBeSetAsHorizontalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
<Button.Content>
<TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}"
FontSize="14">
<Run Text="&#xE734;" FontFamily="Segoe MDL2 Assets"/>
FontSize="16">
<Run Text="&#xE734;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
<Run Text="{x:Static props:Resources.Default_Layout_Horizontal}"/>
</TextBlock>
</Button.Content>
@@ -697,8 +691,8 @@
Visibility="{Binding IsHorizontalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
<Button.Content>
<TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Horizontal}"
FontSize="14">
<Run Text="&#xE735;" FontFamily="Segoe MDL2 Assets"/>
FontSize="16">
<Run Text="&#xE735;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
<Run Text="{x:Static props:Resources.Default_Layout_Horizontal}"/>
</TextBlock>
</Button.Content>
@@ -712,8 +706,8 @@
Visibility="{Binding CanBeSetAsVerticalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
<Button.Content>
<TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Vertical_Default}"
FontSize="14">
<Run Text="&#xE734;" FontFamily="Segoe MDL2 Assets"/>
FontSize="16">
<Run Text="&#xE734;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
<Run Text="{x:Static props:Resources.Default_Layout_Vertical}"/>
</TextBlock>
</Button.Content>
@@ -726,8 +720,8 @@
Visibility="{Binding IsVerticalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
<Button.Content>
<TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Vertical}"
FontSize="14">
<Run Text="&#xE735;" FontFamily="Segoe MDL2 Assets"/>
FontSize="16">
<Run Text="&#xE735;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
<Run Text="{x:Static props:Resources.Default_Layout_Vertical}"/>
</TextBlock>
</Button.Content>
@@ -774,7 +768,7 @@
Margin="0,4,0,0"
AutomationProperties.Name="{x:Static props:Resources.Layout_Grid_Title}"
HorizontalAlignment="Left"
FontFamily="Segoe MDL2 Assets" />
FontFamily="{DynamicResource SymbolThemeFontFamily}" />
<StackPanel Grid.Column="1"
Orientation="Vertical">
<TextBlock TextWrapping="Wrap"
@@ -810,7 +804,7 @@
AutomationProperties.Name="{x:Static props:Resources.Layout_Canvas_Title}"
Margin="0,4,0,0"
HorizontalAlignment="Left"
FontFamily="Segoe MDL2 Assets" />
FontFamily="{DynamicResource SymbolThemeFontFamily}" />
<StackPanel Grid.Column="1"
Orientation="Vertical">
<TextBlock TextWrapping="Wrap"

2
src/modules/fancyzones/editor/FancyZonesEditor/Models/MonitorInfoModel.cs
View File

@@ -60,7 +60,7 @@ namespace FancyZonesEditor.Utils
}
else
{
return ScreenBoundsWidth + " x " + ScreenBoundsHeight;
return ScreenBoundsWidth + " × " + ScreenBoundsHeight;
}
}
}

2
src/modules/fancyzones/editor/FancyZonesEditor/Styles/ButtonStyles.xaml
View File

@@ -50,7 +50,7 @@
VerticalAlignment="Stretch"
UseLayoutRounding="False"
Opacity="0"
CornerRadius="2"
CornerRadius="4"
BorderThickness="2"
BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}" />

4
src/modules/fancyzones/editor/FancyZonesEditor/ViewModels/MonitorViewModel.cs
View File

@@ -10,8 +10,8 @@ namespace FancyZonesEditor.ViewModels
{
public class MonitorViewModel : INotifyPropertyChanged
{
private const int MaxPreviewDisplaySize = 160;
private const int MinPreviewDisplaySize = 98;
private const int MaxPreviewDisplaySize = 180;
private const int MinPreviewDisplaySize = 120;
public event PropertyChangedEventHandler PropertyChanged;