Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 19:27:56 +01: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

16
src/modules/Hosts/Hosts/Views/MainPage.xaml
View File

@@ -47,15 +47,13 @@
Command="{x:Bind NewDialogCommand}"> Command="{x:Bind NewDialogCommand}">
<StackPanel <StackPanel
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="8">
<TextBlock <FontIcon
x:Name="Icon" x:Name="Icon"
Margin="0,0,0,0"
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16" FontSize="16"
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
Text="&#xe710;" /> Glyph="&#xe710;" />
<TextBlock x:Uid="AddEntry" /> <TextBlock x:Uid="AddEntry" />
</StackPanel> </StackPanel>
</Button> </Button>
@@ -71,7 +69,7 @@
Style="{StaticResource SubtleButtonStyle}"> Style="{StaticResource SubtleButtonStyle}">
<FontIcon <FontIcon
FontFamily="{StaticResource SymbolThemeFontFamily}" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="14" FontSize="16"
Glyph="&#xe8a5;" /> Glyph="&#xe8a5;" />
</Button> </Button>
@@ -81,7 +79,7 @@
Style="{StaticResource SubtleButtonStyle}"> Style="{StaticResource SubtleButtonStyle}">
<FontIcon <FontIcon
FontFamily="{StaticResource SymbolThemeFontFamily}" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="14" FontSize="16"
Glyph="&#xe71c;" /> Glyph="&#xe71c;" />
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>
@@ -141,7 +139,7 @@
Style="{StaticResource SubtleButtonStyle}"> Style="{StaticResource SubtleButtonStyle}">
<FontIcon <FontIcon
FontFamily="{StaticResource SymbolThemeFontFamily}" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="14" FontSize="16"
Glyph="&#xe8a7;" /> Glyph="&#xe8a7;" />
</Button> </Button>
@@ -152,7 +150,7 @@
Style="{StaticResource SubtleButtonStyle}"> Style="{StaticResource SubtleButtonStyle}">
<FontIcon <FontIcon
FontFamily="{StaticResource SymbolThemeFontFamily}" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="14" FontSize="16"
Glyph="&#xe713;" /> Glyph="&#xe713;" />
</Button> </Button>
</StackPanel> </StackPanel>

18
src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
View File

@@ -11,7 +11,7 @@
Margin="12,16,12,0" Margin="12,16,12,0"
Width="348" Width="348"
Height="36" Height="36"
CornerRadius="2" CornerRadius="4"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource ColorControlBackgroundBrush}"> Background="{DynamicResource ColorControlBackgroundBrush}">
<Grid> <Grid>
@@ -22,17 +22,16 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock x:Name="FormatNameTextBlock" <TextBlock x:Name="FormatNameTextBlock"
Opacity="0.6" Opacity="0.6"
Style="{DynamicResource BodyStrongTextBlockStyle}"
Foreground="{DynamicResource PrimaryForegroundBrush}" Foreground="{DynamicResource PrimaryForegroundBrush}"
Margin="8" Margin="8"
FontWeight="SemiBold"
FontSize="12"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<TextBox x:Name="ColorTextRepresentationTextBlock" <TextBox x:Name="ColorTextRepresentationTextBlock"
Foreground="{DynamicResource PrimaryForegroundBrush}"
FontFamily="Consolas" FontFamily="Consolas"
Grid.Column="1"
FontSize="14" FontSize="14"
Foreground="{DynamicResource PrimaryForegroundBrush}"
Grid.Column="1"
IsTabStop="False" IsTabStop="False"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
@@ -45,17 +44,16 @@
<Button x:Name="CopyToClipboardButton" <Button x:Name="CopyToClipboardButton"
ToolTipService.ToolTip="{x:Static p:Resources.Copy_to_clipboard}" ToolTipService.ToolTip="{x:Static p:Resources.Copy_to_clipboard}"
Background="{DynamicResource ColorControlBackgroundBrush}" Background="{DynamicResource ColorControlBackgroundBrush}"
FontSize="16"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Foreground="{DynamicResource PrimaryForegroundBrush}" Foreground="{DynamicResource PrimaryForegroundBrush}"
Opacity="0.6" Opacity="0.6"
Height="36" Height="36"
Width="36" Width="36"
Grid.Column="2" Grid.Column="2"
AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}"
AutomationProperties.HelpText="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:Controls.ColorFormatControl}}, Path=SelectedColorCopyHelperText}"
FontSize="12"
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
FontFamily="Segoe MDL2 Assets"> AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}"
AutomationProperties.HelpText="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:Controls.ColorFormatControl}}, Path=SelectedColorCopyHelperText}">
<Button.Content> <Button.Content>
<TextBlock Text="&#xE8C8;" AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}" /> <TextBlock Text="&#xE8C8;" AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}" />
</Button.Content> </Button.Content>

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

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

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

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

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

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

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

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

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

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

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

@@ -60,7 +60,7 @@ namespace FancyZonesEditor.Utils
} }
else 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" VerticalAlignment="Stretch"
UseLayoutRounding="False" UseLayoutRounding="False"
Opacity="0" Opacity="0"
CornerRadius="2" CornerRadius="4"
BorderThickness="2" BorderThickness="2"
BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}" /> 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 public class MonitorViewModel : INotifyPropertyChanged
{ {
private const int MaxPreviewDisplaySize = 160; private const int MaxPreviewDisplaySize = 180;
private const int MinPreviewDisplaySize = 98; private const int MinPreviewDisplaySize = 120;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

41
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@@ -30,21 +30,32 @@
<RowDefinition Height="24" /> <RowDefinition Height="24" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="{Binding Name}" <TextBlock Text="{Binding Name}"
FontWeight="SemiBold"
FontSize="14" FontSize="14"
Margin="0,0,0,0" FontWeight="SemiBold"/>
VerticalAlignment="Top"
Foreground="{DynamicResource PrimaryForegroundBrush}" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Grid.Row="1" Grid.Row="1"
VerticalAlignment="Top"> VerticalAlignment="Top">
<TextBlock Text="{Binding Fit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ThirdPersonSingular}" FontSize="12" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Fit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ThirdPersonSingular}"
<TextBlock Text="{Binding Width, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}" FontWeight="SemiBold" FontSize="12" Margin="3,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> Style="{StaticResource CaptionTextBlockStyle}"
<TextBlock Text="&#xE947;" FontFamily="Segoe MDL2 Assets" FontSize="10" Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" Margin="4,4,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
<TextBlock Text="{Binding Height, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}" FontSize="12" Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" FontWeight="SemiBold" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Width, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}"
<TextBlock Text="{Binding Unit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ToLower}" FontSize="12"
Margin="4,0,0,0" Margin="4,0,0,0"
Foreground="{DynamicResource SecondaryForegroundBrush}" /> Style="{StaticResource CaptionTextBlockStyle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
<TextBlock Text="×"
Margin="4,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}"/>
<TextBlock Text="{Binding Height, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}"
Margin="4,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}"/>
<TextBlock Text="{Binding Unit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ToLower}"
Margin="4,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
@@ -54,10 +65,10 @@
AutomationProperties.Name="{Binding Name}"> AutomationProperties.Name="{Binding Name}">
<TextBlock Text="{Binding Name}" <TextBlock Text="{Binding Name}"
FontWeight="SemiBold"
FontSize="14"
Margin="0,0,0,0" Margin="0,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14"
FontWeight="SemiBold"
Foreground="{DynamicResource PrimaryForegroundBrush}" /> Foreground="{DynamicResource PrimaryForegroundBrush}" />
</Grid> </Grid>
</DataTemplate> </DataTemplate>
@@ -86,8 +97,8 @@
</ui:NumberBox> </ui:NumberBox>
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Text="&#xE947;" Text="&#xE947;"
FontFamily="Segoe MDL2 Assets" FontFamily="{StaticResource SymbolThemeFontFamily}"
Width="25" Width="24"
Foreground="{DynamicResource SecondaryForegroundBrush}" Foreground="{DynamicResource SecondaryForegroundBrush}"
Name="Times_Symbol" Name="Times_Symbol"
AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}" AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}"
@@ -166,7 +177,7 @@
Margin="-8,0,0,0" Margin="-8,0,0,0"
Content="&#xE713;" Content="&#xE713;"
Background="Transparent" Background="Transparent"
FontFamily="Segoe MDL2 Assets" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="16" FontSize="16"
HorizontalAlignment="Left" HorizontalAlignment="Left"
ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}" ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}"

2
src/modules/launcher/PowerLauncher/ResultList.xaml
View File

@@ -45,7 +45,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" <Border x:Name="border"
CornerRadius="2" CornerRadius="4"
Background="Transparent" Background="Transparent"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="Transparent" BorderBrush="Transparent"

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

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

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

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

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

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

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

@@ -35,7 +35,9 @@
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<labs:SettingsCard <labs:SettingsCard
x:Uid="FancyZones_LaunchEditorButtonControl" 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}" Command="{x:Bind ViewModel.LaunchEditorEventHandler}"
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
IsClickEnabled="True" /> IsClickEnabled="True" />
@@ -115,8 +117,8 @@
<labs:SettingsExpander.Items> <labs:SettingsExpander.Items>
<labs:SettingsCard ContentAlignment="Left"> <labs:SettingsCard ContentAlignment="Left">
<controls:FancyZonesPreviewControl <controls:FancyZonesPreviewControl
Width="170" Width="192"
Height="86" Height="108"
CustomBorderColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=OneWay}" CustomBorderColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=OneWay}"
CustomHighlightColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=OneWay}" CustomHighlightColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=OneWay}"
CustomInActiveColor="{x:Bind Path=ViewModel.ZoneInActiveColor, 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"> Spacing="8">
<TextBlock <TextBlock
x:Name="pathTextBlock" x:Name="pathTextBlock"
Width="350"
HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True" IsTextSelectionEnabled="True"
Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}"
TextAlignment="Right" TextTrimming="CharacterEllipsis"
TextTrimming="CharacterEllipsis"> Foreground="{ThemeResource TextFillColorSecondaryBrush}">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip IsEnabled="{Binding ElementName=pathTextBlock, Path=IsTextTrimmed}"> <ToolTip IsEnabled="{Binding ElementName=pathTextBlock, Path=IsTextTrimmed}">
<TextBlock Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" /> <TextBlock Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" />
@@ -274,14 +270,9 @@
x:Uid="General_SettingsBackupAndRestoreStatusInfo" x:Uid="General_SettingsBackupAndRestoreStatusInfo"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ContentAlignment="Vertical"> 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 Margin="0,0,0,6" ColumnSpacing="8">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" MinWidth="{StaticResource SettingActionControlMinWidth}"/>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>