chore: Re-add removed virtual methods

unoplatform · Dec 14, 2022 · f799360 · f799360
1 parent 8cab9db
commit f799360
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.Legacy.cs b/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.Legacy.cs
@@ -90,7 +90,7 @@ private void OnBasePropertyChanged(DependencyObject sender, DependencyProperty d
 			get => GetHorizontalOffsetValue();
 			set => SetHorizontalOffsetValue(value);
 		}
-		private void OnHorizontalOffsetChanged(double oldValue, double newValue)
+		private new void OnHorizontalOffsetChanged(double oldValue, double newValue)
 			=> base.HorizontalOffset = newValue;
 
 		[GeneratedDependencyProperty(DefaultValue = 0.0, LocalCache = false, ChangedCallback = true)]
@@ -104,7 +104,7 @@ private void OnHorizontalOffsetChanged(double oldValue, double newValue)
 			set => SetVerticalOffsetValue(value);
 		}
 
-		private void OnVerticalOffsetChanged(double oldValue, double newValue)
+		private new void OnVerticalOffsetChanged(double oldValue, double newValue)
 			=> base.VerticalOffset = newValue;
 
 		[GeneratedDependencyProperty(DefaultValue = 0.0, LocalCache = false, ChangedCallback = true)]

diff --git a/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.cs b/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.cs
@@ -205,7 +205,21 @@ public double HorizontalOffset
 				nameof(HorizontalOffset),
 				typeof(double),
 				typeof(Popup),
-				new FrameworkPropertyMetadata(0.0, FrameworkPropertyMetadataOptions.AffectsMeasure));
+				new FrameworkPropertyMetadata(
+					0.0,
+					FrameworkPropertyMetadataOptions.AffectsMeasure,
+					propertyChangedCallback: (s, e) => ((Popup)s)?.OnHorizontalOffsetChanged((double)e.OldValue, (double)e.NewValue)
+				)
+			);
+
+		protected virtual void OnHorizontalOffsetChanged(double oldHorizontalOffset, double newHorizontalOffset)
+		{
+			OnHorizontalOffsetChangedPartial(oldHorizontalOffset, newHorizontalOffset);
+			OnHorizontalOffsetChangedPartialNative(oldHorizontalOffset, newHorizontalOffset);
+		}
+
+		partial void OnHorizontalOffsetChangedPartial(double oldHorizontalOffset, double newHorizontalOffset);
+		partial void OnHorizontalOffsetChangedPartialNative(double oldHorizontalOffset, double newHorizontalOffset);
 
 		/// <summary>
 		/// Gets or sets the distance between the top of the application window and the top of the popup.
@@ -224,7 +238,21 @@ public double VerticalOffset
 				nameof(VerticalOffset),
 				typeof(double),
 				typeof(Popup),
-				new FrameworkPropertyMetadata(0.0, FrameworkPropertyMetadataOptions.AffectsMeasure));
+				new FrameworkPropertyMetadata(
+					0.0,
+					FrameworkPropertyMetadataOptions.AffectsMeasure,
+					propertyChangedCallback: (s, e) => ((Popup)s)?.OnVerticalOffsetChanged((double)e.OldValue, (double)e.NewValue)
+				)
+			);
+
+		protected virtual void OnVerticalOffsetChanged(double oldVerticalOffset, double newVerticalOffset)
+		{
+			OnVerticalOffsetChangedPartial(oldVerticalOffset, newVerticalOffset);
+			OnVerticalOffsetChangedPartialNative(oldVerticalOffset, newVerticalOffset);
+		}
+
+		partial void OnVerticalOffsetChangedPartial(double oldVerticalOffset, double newVerticalOffset);
+		partial void OnVerticalOffsetChangedPartialNative(double oldVerticalOffset, double newVerticalOffset);
 
 		/// <summary>
 		/// Raised when the ActualPlacement property changes.