Port microsoft/microsoft-ui-xaml#4563 (#625)

Kinnara · Nov 22, 2023 · b3e8c2e · b3e8c2e
1 parent e5c8538
commit b3e8c2e
Show file tree

Hide file tree

Showing 9 changed files with 492 additions and 3 deletions.
diff --git a/ModernWpf.Controls/Common/SharedHelpers.cs b/ModernWpf.Controls/Common/SharedHelpers.cs
@@ -158,6 +158,75 @@ public static void RaiseAutomationPropertyChangedEvent(UIElement element, object
             }
         }
 
+        public static IconElement MakeIconElementFrom(IconSource iconSource)
+        {
+            if (iconSource is FontIconSource fontIconSource)
+            {
+                FontIcon fontIcon = new();
+
+                fontIcon.Glyph = fontIconSource.Glyph;
+                fontIcon.FontSize = fontIconSource.FontSize;
+                if (fontIconSource.Foreground is { } newForeground)
+                {
+                    fontIcon.Foreground = newForeground;
+                }
+
+                if (fontIconSource.FontFamily != null)
+                {
+                    fontIcon.FontFamily = fontIconSource.FontFamily;
+                }
+
+                fontIcon.FontWeight = fontIconSource.FontWeight;
+                fontIcon.FontStyle = fontIconSource.FontStyle;
+                //fontIcon.IsTextScaleFactorEnabled(fontIconSource.IsTextScaleFactorEnabled());
+                //fontIcon.MirroredWhenRightToLeft(fontIconSource.MirroredWhenRightToLeft());
+
+                return fontIcon;
+            }
+            else if (iconSource is SymbolIconSource symbolIconSource)
+            {
+                SymbolIcon symbolIcon = new();
+                symbolIcon.Symbol = symbolIconSource.Symbol;
+                if (symbolIconSource.Foreground is { } newForeground)
+                {
+                    symbolIcon.Foreground = newForeground;
+                }
+                return symbolIcon;
+            }
+            else if (iconSource is BitmapIconSource bitmapIconSource)
+            {
+                BitmapIcon bitmapIcon = new();
+
+                if (bitmapIconSource.UriSource != null)
+                {
+                    bitmapIcon.UriSource = bitmapIconSource.UriSource;
+                }
+
+                bitmapIcon.ShowAsMonochrome = bitmapIconSource.ShowAsMonochrome;
+                if (bitmapIconSource.Foreground is { } newForeground)
+                {
+                    bitmapIcon.Foreground = newForeground;
+                }
+                return bitmapIcon;
+            }
+            else if (iconSource is PathIconSource pathIconSource)
+            {
+                PathIcon pathIcon = new();
+
+                if (pathIconSource.Data != null)
+                {
+                    pathIcon.Data = pathIconSource.Data;
+                }
+                if (pathIconSource.Foreground is { } newForeground)
+                {
+                    pathIcon.Foreground = newForeground;
+                }
+                return pathIcon;
+            }
+
+            return null;
+        }
+
         public static BindingExpressionBase SetBinding(
             this FrameworkElement element,
             DependencyProperty dp,

diff --git a/ModernWpf.Controls/DropDownButton/DropDownButton.xaml b/ModernWpf.Controls/DropDownButton/DropDownButton.xaml
@@ -55,7 +55,6 @@
                                 Grid.Column="1"
                                 FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                 FontSize="8"
-                                Foreground="{DynamicResource ButtonForegroundPressed}"
                                 Data="{StaticResource ChevronDownSmall}"
                                 VerticalAlignment="Center"
                                 Padding="2,4,2,0"

diff --git a/ModernWpf/IconSource/BitmapIconSource.cs b/ModernWpf/IconSource/BitmapIconSource.cs
@@ -75,5 +75,19 @@ protected override IconElement CreateIconElementCore()
             }
             return bitmapIcon;
         }
+
+        protected override DependencyProperty GetIconElementPropertyCore(DependencyProperty sourceProperty)
+        {
+            if (sourceProperty == ShowAsMonochromeProperty)
+            {
+                return BitmapIcon.ShowAsMonochromeProperty;
+            }
+            else if (sourceProperty == UriSourceProperty)
+            {
+                return BitmapIcon.UriSourceProperty;
+            }
+
+            return base.GetIconElementPropertyCore(sourceProperty);
+        }
     }
 }
diff --git a/ModernWpf/IconSource/FontIconSource.cs b/ModernWpf/IconSource/FontIconSource.cs
@@ -155,5 +155,39 @@ protected override IconElement CreateIconElementCore()
 
             return fontIcon;
         }
+
+        protected override DependencyProperty GetIconElementPropertyCore(DependencyProperty sourceProperty)
+        {
+            if (sourceProperty == FontFamilyProperty)
+            {
+                return FontIcon.FontFamilyProperty;
+            }
+            else if (sourceProperty == FontSizeProperty)
+            {
+                return FontIcon.FontSizeProperty;
+            }
+            else if (sourceProperty == FontStyleProperty)
+            {
+                return FontIcon.FontStyleProperty;
+            }
+            else if (sourceProperty == FontWeightProperty)
+            {
+                return FontIcon.FontWeightProperty;
+            }
+            else if (sourceProperty == GlyphProperty)
+            {
+                return FontIcon.GlyphProperty;
+            }
+            //else if (sourceProperty == IsTextScaleFactorEnabledProperty)
+            //{
+            //    return FontIcon.IsTextScaleFactorEnabledProperty;
+            //}
+            //else if (sourceProperty == MirroredWhenRightToLeftProperty)
+            //{
+            //    return FontIcon.MirroredWhenRightToLeftProperty;
+            //}
+
+            return base.GetIconElementPropertyCore(sourceProperty);
+        }
     }
 }
diff --git a/ModernWpf/IconSource/IconSource.cs b/ModernWpf/IconSource/IconSource.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
 
@@ -35,9 +37,42 @@ public Brush Foreground
 
         public IconElement CreateIconElement()
         {
-            return CreateIconElementCore();
+            var element = CreateIconElementCore();
+            m_createdIconElements.Add(new WeakReference<IconElement>(element));
+            return element;
         }
 
         protected abstract IconElement CreateIconElementCore();
+
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs args)
+        {
+            base.OnPropertyChanged(args);
+
+            var iconProp = GetIconElementPropertyCore(args.Property);
+            if (iconProp != null)
+            {
+                m_createdIconElements.RemoveAll(weakElement =>
+                {
+                    if (weakElement.TryGetTarget(out var element))
+                    {
+                        element.SetValue(iconProp, args.NewValue);
+                        return false;
+                    }
+                    return true;
+                });
+            }
+        }
+
+        protected virtual DependencyProperty GetIconElementPropertyCore(DependencyProperty sourceProperty)
+        {
+            if (sourceProperty == ForegroundProperty)
+            {
+                return IconElement.ForegroundProperty;
+            }
+
+            return null;
+        }
+
+        private readonly List<WeakReference<IconElement>> m_createdIconElements = new();
     }
 }
diff --git a/ModernWpf/IconSource/PathIconSource.cs b/ModernWpf/IconSource/PathIconSource.cs
@@ -53,5 +53,15 @@ protected override IconElement CreateIconElementCore()
             }
             return pathIcon;
         }
+
+        protected override DependencyProperty GetIconElementPropertyCore(DependencyProperty sourceProperty)
+        {
+            if (sourceProperty == DataProperty)
+            {
+                return PathIcon.DataProperty;
+            }
+
+            return base.GetIconElementPropertyCore(sourceProperty);
+        }
     }
 }
diff --git a/ModernWpf/IconSource/SymbolIconSource.cs b/ModernWpf/IconSource/SymbolIconSource.cs
@@ -49,5 +49,15 @@ protected override IconElement CreateIconElementCore()
             }
             return symbolIcon;
         }
+
+        protected override DependencyProperty GetIconElementPropertyCore(DependencyProperty sourceProperty)
+        {
+            if (sourceProperty == SymbolProperty)
+            {
+                return SymbolIcon.SymbolProperty;
+            }
+
+            return base.GetIconElementPropertyCore(sourceProperty);
+        }
     }
 }
diff --git a/ModernWpf/Styles/CheckBox.xaml b/ModernWpf/Styles/CheckBox.xaml
@@ -11,7 +11,7 @@
 
     <sys:Double x:Key="CheckBoxBorderThickness">1</sys:Double>
     <sys:Double x:Key="CheckBoxSize">20</sys:Double>
-    <sys:Double x:Key="CheckBoxGlyphSize">16</sys:Double>
+    <sys:Double x:Key="CheckBoxGlyphSize">12</sys:Double>
     <sys:Double x:Key="CheckBoxHeight">32</sys:Double>
     <sys:Double x:Key="CheckBoxMinWidth">120</sys:Double>
     <Thickness x:Key="CheckBoxPadding">8,5,0,0</Thickness>
@@ -76,6 +76,7 @@
                                     Data="{StaticResource CheckMark}"
                                     FontSize="{StaticResource CheckBoxGlyphSize}"
                                     Foreground="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
+                                    Margin="4"
                                     Opacity="0" />
                             </Grid>
                             <local:ContentPresenterEx