feat(PersonPicture): Overwriteable properties for style

unoplatform · Aug 28, 2023 · 5a37d19 · 5a37d19
1 parent 3dc3062
commit 5a37d19
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
@@ -12,6 +12,9 @@
 
     <Style x:Key="DefaultPersonPictureStyle" TargetType="local:PersonPicture">
         <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
+        <Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource PersonPictureEllipseFillStrokeBrush}"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}"/>
         <Setter Property="Width" Value="96" />
         <Setter Property="Height" Value="96" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -74,9 +77,9 @@
                         </VisualStateManager.VisualStateGroups>
 
                         <Ellipse
-                            Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}"
-                            Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}"
-                            StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}"
+                            Fill="{TemplateBinding Background}"
+                            Stroke="{TemplateBinding BorderBrush}"
+                            StrokeThickness="{TemplateBinding BorderThickness}"
                             Width="{TemplateBinding Width}"
                             Height="{TemplateBinding Height}" />
 

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.xaml b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.xaml
@@ -12,6 +12,9 @@
 
     <Style x:Key="DefaultPersonPictureStyle" TargetType="local:PersonPicture">
         <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
+		<Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource SystemColorButtonTextColor}"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}"/>
         <Setter Property="Width" Value="100" />
         <Setter Property="Height" Value="100" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -73,9 +76,9 @@
                         </VisualStateManager.VisualStateGroups>
 
                         <Ellipse
-                            Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}"
-                            Stroke="{ThemeResource SystemColorButtonTextColor}"
-                            StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}"
+                            Fill="{TemplateBinding Background}"
+                            Stroke="{TemplateBinding BorderBrush}"
+                            StrokeThickness="{TemplateBinding BorderThickness}"
                             Width="{TemplateBinding Width}"
                             Height="{TemplateBinding Height}" />