Merge branch 'main' into fix/imagecropper-aspect-ratio-not-updating-on-image-load

Arlodotexe · Arlodotexe · commit 24391ac71b63 · 2022-09-14T14:59:31.000-05:00
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
@@ -11,7 +11,8 @@
         <controls:ListDetailsView BackButtonBehavior="Automatic"
                                     ItemsSource="{Binding Emails}"
                                     NoSelectionContent="Select an item to view"
-                                    CompactModeThresholdWidth="720">
+                                    CompactModeThresholdWidth="720"
+                                    ListPaneWidth="400">
             <controls:ListDetailsView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="0,8">
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Activities/StopAnimationActivity.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Activities/StopAnimationActivity.cs
@@ -29,7 +29,7 @@ public AnimationSet Animation
         public static readonly DependencyProperty AnimationProperty = DependencyProperty.Register(
             nameof(Animation),
             typeof(AnimationSet),
-            typeof(StartAnimationActivity),
+            typeof(StopAnimationActivity),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -47,7 +47,7 @@ public UIElement TargetObject
         public static readonly DependencyProperty TargetObjectProperty = DependencyProperty.Register(
             nameof(TargetObject),
             typeof(UIElement),
-            typeof(StartAnimationActivity),
+            typeof(StopAnimationActivity),
             new PropertyMetadata(null));
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs
@@ -47,7 +47,7 @@ public UIElement TargetObject
         public static readonly DependencyProperty TargetObjectProperty = DependencyProperty.Register(
             nameof(TargetObject),
             typeof(UIElement),
-            typeof(StartAnimationActivity),
+            typeof(StartAnimationAction),
             new PropertyMetadata(null));
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs
@@ -46,10 +46,10 @@ protected override bool Uninitialize()
         }
 
         /// <summary>
-        /// The UIElement that will be faded.
+        /// The UIElement that will be sticky.
         /// </summary>
         public static readonly DependencyProperty HeaderElementProperty = DependencyProperty.Register(
-            nameof(HeaderElement), typeof(UIElement), typeof(QuickReturnHeaderBehavior), new PropertyMetadata(null, PropertyChangedCallback));
+            nameof(HeaderElement), typeof(UIElement), typeof(StickyHeaderBehavior), new PropertyMetadata(null, PropertyChangedCallback));
 
         private ScrollViewer _scrollViewer;
         private double _previousVerticalScrollOffset;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
@@ -461,7 +461,10 @@ protected override void OnItemsChanged(object e)
         /// </summary>
         private void OnListPaneWidthChanged()
         {
-            _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            if (_twoPaneView != null)
+            {
+                _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            }
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -293,6 +293,12 @@ protected override void SetElementChildVisual(AttachedShadowElementContext conte
             else
             {
                 base.SetElementChildVisual(context);
+
+                // Reset context.SpriteVisual.Size and RelativeSizeAdjustment to default values
+                // as they may be changed in the block above.
+                context.SpriteVisual.Size = Vector2.Zero;
+                context.SpriteVisual.RelativeSizeAdjustment = Vector2.One;
+
                 context.RemoveAndDisposeResource(OpacityMaskVisualSurfaceResourceKey);
                 context.RemoveAndDisposeResource(OpacityMaskSurfaceBrushResourceKey);
                 context.RemoveAndDisposeResource(OpacityMaskVisualResourceKey);
@@ -305,25 +311,33 @@ protected internal override void OnSizeChanged(AttachedShadowElementContext cont
         {
             Vector2 sizeAsVec2 = newSize.ToVector2();
 
-            CompositionRoundedRectangleGeometry geometry = context.GetResource(RoundedRectangleGeometryResourceKey);
-            if (geometry != null)
+            if (context.TryGetResource(RoundedRectangleGeometryResourceKey, out CompositionRoundedRectangleGeometry geometry))
             {
                 geometry.Size = sizeAsVec2;
             }
 
-            CompositionVisualSurface visualSurface = context.GetResource(VisualSurfaceResourceKey);
-            if (geometry != null)
+            if (context.TryGetResource(VisualSurfaceResourceKey, out CompositionVisualSurface visualSurface))
             {
                 visualSurface.SourceSize = sizeAsVec2;
             }
 
-            ShapeVisual shapeVisual = context.GetResource(ShapeVisualResourceKey);
-            if (geometry != null)
+            if (context.TryGetResource(ShapeVisualResourceKey, out ShapeVisual shapeVisual))
             {
                 shapeVisual.Size = sizeAsVec2;
             }
 
+            if (context.TryGetResource(OpacityMaskVisualSurfaceResourceKey, out CompositionVisualSurface opacityMaskVisualSurface))
+            {
+                opacityMaskVisualSurface.SourceSize = sizeAsVec2 + new Vector2(MaxBlurRadius * 2);
+            }
+
+            if (InnerContentClipMode is InnerContentClipMode.CompositionMaskBrush)
+            {
+                context.SpriteVisual.Size = sizeAsVec2;
+            }
+
             UpdateShadowClip(context);
+            UpdateVisualOpacityMask(context);
 
             base.OnSizeChanged(context, newSize, previousSize);
         }
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -290,7 +290,11 @@ protected override CompositionBrush GetShadowMask(AttachedShadowElementContext c
                     // Create a ShapeVisual so that our geometry can be rendered to a visual
                     var shapeVisual = context.GetResource(ShapeVisualResourceKey) ??
                                       context.AddResource(ShapeVisualResourceKey, context.Compositor.CreateShapeVisual());
-                    shapeVisual.Shapes.Add(shape);
+
+                    if (!shapeVisual.Shapes.Contains(shape))
+                    {
+                        shapeVisual.Shapes.Add(shape);
+                    }
 
                     // Create a CompositionVisualSurface, which renders our ShapeVisual to a texture
                     var visualSurface = context.GetResource(VisualSurfaceResourceKey) ??
@@ -344,6 +348,7 @@ protected internal override void OnSizeChanged(AttachedShadowElementContext cont
             context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
 
             UpdateShadowClip(context);
+            UpdateShadowMask(context);
 
             base.OnSizeChanged(context, newSize, previousSize);
         }
diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest
@@ -1,4 +1,4 @@
-<Package
+﻿<Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
@@ -7,7 +7,7 @@
 
   <Identity
     Name="3568ebdf-5b6b-4ddd-bb17-462d614ba50f"
-    Publisher="CN=alzollin"
+    Publisher="CN=toolkit"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="3568ebdf-5b6b-4ddd-bb17-462d614ba50f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
@@ -1,4 +1,4 @@
-﻿<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -22,7 +22,7 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>UITests.App.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>A39FFC9A7EDC3BC1F62B1FC6409AD9EDD84E8CF0</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>C732A02FD6C4120C84E0559E5ADE1A83D15B41BD</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
diff --git a/UITests/UITests.App/UITests.App.pfx b/UITests/UITests.App/UITests.App.pfx
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -52,7 +52,7 @@ private static async Task InitalizeComService()
 
             // Use Windows.ApplicationModel.Package.Current.Id.FamilyName
             // within the app service provider to get this value.
-            CommunicationService.PackageFamilyName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t";
+            CommunicationService.PackageFamilyName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme";
 
             var status = await CommunicationService.OpenAsync();
 
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -58,8 +58,8 @@ internal static TestApplicationInfo WinUICsUWPSampleApp
 
                 return new TestApplicationInfo(
                     testAppPackageName: "UITests.App",
-                    testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
-                    testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
+                    testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App",
+                    testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme",
                     testAppMainWindowTitle: "UITests.App",
                     processName: "UITests.App.exe",
                     installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty),

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,10 @@ protected override void OnItemsChanged(object e)`
`461`	`461`	`/// </summary>`
`462`	`462`	`private void OnListPaneWidthChanged()`
`463`	`463`	`{`
`464`		`- _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);`
	`464`	`+ if (_twoPaneView != null)`
	`465`	`+ {`
	`466`	`+ _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);`
	`467`	`+ }`
`465`	`468`	`}`
`466`	`469`	`}`
`467`	`470`	`}`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,12 @@ protected override void SetElementChildVisual(AttachedShadowElementContext conte`
`293`	`293`	`else`
`294`	`294`	`{`
`295`	`295`	`base.SetElementChildVisual(context);`
	`296`	`+`
	`297`	`+ // Reset context.SpriteVisual.Size and RelativeSizeAdjustment to default values`
	`298`	`+ // as they may be changed in the block above.`
	`299`	`+ context.SpriteVisual.Size = Vector2.Zero;`
	`300`	`+ context.SpriteVisual.RelativeSizeAdjustment = Vector2.One;`
	`301`	`+`
`296`	`302`	`context.RemoveAndDisposeResource(OpacityMaskVisualSurfaceResourceKey);`
`297`	`303`	`context.RemoveAndDisposeResource(OpacityMaskSurfaceBrushResourceKey);`
`298`	`304`	`context.RemoveAndDisposeResource(OpacityMaskVisualResourceKey);`
`@@ -305,25 +311,33 @@ protected internal override void OnSizeChanged(AttachedShadowElementContext cont`
`305`	`311`	`{`
`306`	`312`	`Vector2 sizeAsVec2 = newSize.ToVector2();`
`307`	`313`
`308`		`- CompositionRoundedRectangleGeometry geometry = context.GetResource(RoundedRectangleGeometryResourceKey);`
`309`		`- if (geometry != null)`
	`314`	`+ if (context.TryGetResource(RoundedRectangleGeometryResourceKey, out CompositionRoundedRectangleGeometry geometry))`
`310`	`315`	`{`
`311`	`316`	`geometry.Size = sizeAsVec2;`
`312`	`317`	`}`
`313`	`318`
`314`		`- CompositionVisualSurface visualSurface = context.GetResource(VisualSurfaceResourceKey);`
`315`		`- if (geometry != null)`
	`319`	`+ if (context.TryGetResource(VisualSurfaceResourceKey, out CompositionVisualSurface visualSurface))`
`316`	`320`	`{`
`317`	`321`	`visualSurface.SourceSize = sizeAsVec2;`
`318`	`322`	`}`
`319`	`323`
`320`		`- ShapeVisual shapeVisual = context.GetResource(ShapeVisualResourceKey);`
`321`		`- if (geometry != null)`
	`324`	`+ if (context.TryGetResource(ShapeVisualResourceKey, out ShapeVisual shapeVisual))`
`322`	`325`	`{`
`323`	`326`	`shapeVisual.Size = sizeAsVec2;`
`324`	`327`	`}`
`325`	`328`
	`329`	`+ if (context.TryGetResource(OpacityMaskVisualSurfaceResourceKey, out CompositionVisualSurface opacityMaskVisualSurface))`
	`330`	`+ {`
	`331`	`+ opacityMaskVisualSurface.SourceSize = sizeAsVec2 + new Vector2(MaxBlurRadius * 2);`
	`332`	`+ }`
	`333`	`+`
	`334`	`+ if (InnerContentClipMode is InnerContentClipMode.CompositionMaskBrush)`
	`335`	`+ {`
	`336`	`+ context.SpriteVisual.Size = sizeAsVec2;`
	`337`	`+ }`
	`338`	`+`
`326`	`339`	`UpdateShadowClip(context);`
	`340`	`+ UpdateVisualOpacityMask(context);`
`327`	`341`
`328`	`342`	`base.OnSizeChanged(context, newSize, previousSize);`
`329`	`343`	`}`