Merge branch 'main' into niels9001/settingsexpander-cornerradius-fix

CommunityToolkit · Jan 30, 2024 · 33f2553 · 33f2553
2 parents 34dfc12 + ea17664
commit 33f2553
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/components/Animations/src/Implicit.cs b/components/Animations/src/Implicit.cs
@@ -129,6 +129,12 @@ public static void SetAnimations(UIElement element, ImplicitAnimationSet value)
     /// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
     private static void OnShowAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        // See https://github.com/CommunityToolkit/Windows/issues/319
+        #if HAS_UNO
+        #pragma warning disable CS0162
+            return;
+        #endif
+
         static void OnAnimationsChanged(object sender, EventArgs e)
         {
             var collection = (ImplicitAnimationSet)sender;
@@ -160,6 +166,10 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 ElementCompositionPreview.SetImplicitShowAnimation(element, null);
             }
         }
+
+        #if HAS_UNO
+        #pragma warning restore CS0162
+        #endif
     }
 
     /// <summary>
@@ -169,6 +179,12 @@ static void OnAnimationsChanged(object sender, EventArgs e)
     /// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
     private static void OnHideAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        // See https://github.com/CommunityToolkit/Windows/issues/319
+        #if HAS_UNO
+        #pragma warning disable CS0162
+            return;
+        #endif
+
         static void OnAnimationsChanged(object sender, EventArgs e)
         {
             var collection = (ImplicitAnimationSet)sender;
@@ -200,6 +216,10 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 ElementCompositionPreview.SetImplicitHideAnimation(element, null);
             }
         }
+
+        #if HAS_UNO
+        #pragma warning restore CS0162
+        #endif
     }
 
     /// <summary>
@@ -209,6 +229,12 @@ static void OnAnimationsChanged(object sender, EventArgs e)
     /// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
     private static void OnAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        // See https://github.com/CommunityToolkit/Windows/issues/319
+        #if HAS_UNO
+        #pragma warning disable CS0162
+            return;
+        #endif
+
         static void OnAnimationsChanged(object sender, EventArgs e)
         {
             var collection = (ImplicitAnimationSet)sender;
@@ -240,5 +266,9 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = null;
             }
         }
+
+        #if HAS_UNO
+        #pragma warning restore CS0162
+        #endif
     }
 }