Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port microsoft/microsoft-ui-xaml#4953 #667

Merged
merged 1 commit into from
Mar 16, 2024
Merged

Port microsoft/microsoft-ui-xaml#4953 #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ModernWpf.Controls/PersonPicture/PersonPicture.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

<Style TargetType="local:PersonPicture">
<Setter Property="Foreground" Value="{DynamicResource PersonPictureForegroundThemeBrush}" />
<Setter Property="Width" Value="100" />
<Setter Property="Height" Value="100" />
<Setter Property="Width" Value="96" />
<Setter Property="Height" Value="96" />
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
<Setter Property="FontWeight" Value="350" />
<Setter Property="FontWeight" Value="SemiBold" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -55,14 +55,14 @@

<Ellipse
Fill="{DynamicResource PersonPictureEllipseFillThemeBrush}"
Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
Stroke="{DynamicResource PersonPictureEllipseFillStrokeBrush}"
StrokeThickness="{DynamicResource PersonPictureEllipseStrokeThickness}"
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}" />

<TextBlock
x:Name="InitialsTextBlock"
FontSize="36"
FontSize="40"
FontFamily="{TemplateBinding FontFamily}"
Foreground="{TemplateBinding Foreground}"
FontWeight="{TemplateBinding FontWeight}"
Expand Down
7 changes: 4 additions & 3 deletions ModernWpf/ThemeResources/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,14 +1232,15 @@
<Thickness x:Key="NumberBoxPopupSpinButtonBorderThickness">0</Thickness>

<!-- Resources for PersonPicture -->
<SolidColorBrush x:Key="PersonPictureForegroundThemeBrush" Color="{m:StaticColor SystemAltHighColor}" />
<m:StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{m:StaticColor SystemBaseHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{m:StaticColor SystemListMediumColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseFillThemeBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
<m:StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternaryBrush" />
<m:StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
<sys:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">0.8</sys:Double>
<sys:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1.0</sys:Double>
<sys:Double x:Key="PersonPictureEllipseStrokeThickness">0</sys:Double>
<sys:Double x:Key="PersonPictureEllipseStrokeThickness">1</sys:Double>
<sys:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</sys:Double>

<!-- Resources for Pivot -->
Expand Down
5 changes: 3 additions & 2 deletions ModernWpf/ThemeResources/HighContrast.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,11 +1207,12 @@
<Thickness x:Key="NumberBoxPopupSpinButtonBorderThickness">2</Thickness>

<!-- Resources for PersonPicture -->
<SolidColorBrush x:Key="PersonPictureForegroundThemeBrush" Color="{StaticResource SystemAltHighColor}" />
<m:StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{StaticResource SystemBaseHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{StaticResource SystemChromeDisabledHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{StaticResource SystemListMediumColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseFillThemeBrush" Color="{StaticResource SystemBaseMediumColor}" />
<m:StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
<m:StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
<sys:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">0.8</sys:Double>
<sys:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1.0</sys:Double>
<sys:Double x:Key="PersonPictureEllipseStrokeThickness">0</sys:Double>
Expand Down
7 changes: 4 additions & 3 deletions ModernWpf/ThemeResources/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,14 +1235,15 @@
<Thickness x:Key="NumberBoxPopupSpinButtonBorderThickness">0</Thickness>

<!-- Resources for PersonPicture -->
<SolidColorBrush x:Key="PersonPictureForegroundThemeBrush" Color="{m:StaticColor SystemAltHighColor}" />
<m:StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{m:StaticColor SystemBaseHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{m:StaticColor SystemListMediumColor}" />
<SolidColorBrush x:Key="PersonPictureEllipseFillThemeBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
<m:StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternaryBrush" />
<m:StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
<sys:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">0.8</sys:Double>
<sys:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1.0</sys:Double>
<sys:Double x:Key="PersonPictureEllipseStrokeThickness">0</sys:Double>
<sys:Double x:Key="PersonPictureEllipseStrokeThickness">1</sys:Double>
<sys:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</sys:Double>

<!-- Resources for Pivot -->
Expand Down
Loading