update to the latest store version

Author: h82258652

components/OpacityMaskView/samples/OpacityMaskViewSample.xaml

@@ -11,19 +11,27 @@
     <StackPanel Spacing="12">
         <controls:OpacityMaskView>
             <controls:OpacityMaskView.OpacityMask>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                    <GradientStop Offset="0" Color="White" />
-                    <GradientStop Offset="1" Color="Transparent" />
-                </LinearGradientBrush>
+                <Rectangle>
+                    <Rectangle.Fill>
+                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                            <GradientStop Offset="0" Color="White" />
+                            <GradientStop Offset="1" Color="Transparent" />
+                        </LinearGradientBrush>
+                    </Rectangle.Fill>
+                                </Rectangle>
             </controls:OpacityMaskView.OpacityMask>
             <Button Content="Hello Windows Community Toolkit" />
         </controls:OpacityMaskView>
         <controls:OpacityMaskView>
             <controls:OpacityMaskView.OpacityMask>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                    <GradientStop Offset="0" Color="White" />
-                    <GradientStop Offset="0.6" Color="Transparent" />
-                </LinearGradientBrush>
+                <Rectangle>
+                    <Rectangle.Fill>
+                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                            <GradientStop Offset="0" Color="White" />
+                            <GradientStop Offset="0.6" Color="Transparent" />
+                        </LinearGradientBrush>
+                    </Rectangle.Fill>
+                </Rectangle>
             </controls:OpacityMaskView.OpacityMask>
             <Border Width="96"
                     Height="96"

components/OpacityMaskView/src/OpacityMaskView.cs

@@ -19,18 +19,18 @@ namespace CommunityToolkit.WinUI.Controls;
 /// A control that applies an opacity mask to its content.
 /// </summary>
 [TemplatePart(Name = RootGridTemplateName, Type = typeof(Grid))]
-[TemplatePart(Name = MaskRectangleTemplateName, Type = typeof(Rectangle))]
+[TemplatePart(Name = MaskContainerTemplateName, Type = typeof(Border))]
 [TemplatePart(Name = ContentPresenterTemplateName, Type = typeof(ContentPresenter))]
 public partial class OpacityMaskView : ContentControl
 {
     /// <summary>
     /// Identifies the <see cref="OpacityMask"/> property.
     /// </summary>
     public static readonly DependencyProperty OpacityMaskProperty =
-        DependencyProperty.Register(nameof(OpacityMask), typeof(Brush), typeof(OpacityMaskView), new PropertyMetadata(null, OnOpacityMaskChanged));
+        DependencyProperty.Register(nameof(OpacityMask), typeof(UIElement), typeof(OpacityMaskView), new PropertyMetadata(null, OnOpacityMaskChanged));
 
     private const string ContentPresenterTemplateName = "PART_ContentPresenter";
-    private const string MaskRectangleTemplateName = "PART_MaskRectangle";
+    private const string MaskContainerTemplateName = "PART_MaskContainer";
     private const string RootGridTemplateName = "PART_RootGrid";
 
 #if WINDOWS_WINAPPSDK
@@ -50,11 +50,11 @@ public OpacityMaskView()
     }
 
     /// <summary>
-    /// Gets or sets an opacity mask, as a <see cref="Brush"/> implementation that is applied to any alpha-channel masking for the rendered content of the content.
+    /// Gets or sets a <see cref="UIElement"/> as the opacity mask that is applied to alpha-channel masking for the rendered content of the content.
     /// </summary>
-    public Brush? OpacityMask
+    public UIElement? OpacityMask
     {
-        get => (Brush?)GetValue(OpacityMaskProperty);
+        get => (UIElement?)GetValue(OpacityMaskProperty);
         set => SetValue(OpacityMaskProperty, value);
     }
 
@@ -65,11 +65,11 @@ protected override void OnApplyTemplate()
 
         Grid rootGrid = (Grid)GetTemplateChild(RootGridTemplateName);
         ContentPresenter contentPresenter = (ContentPresenter)GetTemplateChild(ContentPresenterTemplateName);
-        Rectangle maskRectangle = (Rectangle)GetTemplateChild(MaskRectangleTemplateName);
+        Border maskContainer = (Border)GetTemplateChild(MaskContainerTemplateName);
 
         _maskBrush = _compositor.CreateMaskBrush();
         _maskBrush.Source = GetVisualBrush(contentPresenter);
-        _mask = GetVisualBrush(maskRectangle);
+        _mask = GetVisualBrush(maskContainer);
         _maskBrush.Mask = OpacityMask is null ? null : _mask;
 
         SpriteVisual redirectVisual = _compositor.CreateSpriteVisual();
@@ -105,7 +105,7 @@ private static void OnOpacityMaskChanged(DependencyObject d, DependencyPropertyC
             return;
         }
 
-        Brush? opacityMask = (Brush?)e.NewValue;
+        UIElement? opacityMask = (UIElement?)e.NewValue;
         maskBrush.Mask = opacityMask is null ? null : self._mask;
     }
 }

components/OpacityMaskView/src/OpacityMaskView.xaml

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:CommunityToolkit.WinUI.Controls">
@@ -17,9 +17,9 @@
                     <Grid x:Name="PART_RootGrid"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <Rectangle x:Name="PART_MaskRectangle"
-                                   Fill="{TemplateBinding OpacityMask}"
-                                   IsHitTestVisible="False" />
+                        <Border x:Name="PART_MaskContainer"
+                                Child="{TemplateBinding OpacityMask}"
+                                IsHitTestVisible="False" />
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Content="{TemplateBinding Content}"
                                           ContentTemplate="{TemplateBinding ContentTemplate}" />