Don't use loaded/unloaded

dotnet · Jul 20, 2023 · 8a946c3 · 8a946c3
1 parent 83398c3
commit 8a946c3
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -306,9 +306,8 @@ static object GetDefaultValue(BindableObject bindable)
 		public FlyoutPage()
 		{
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<FlyoutPage>>(() => new PlatformConfigurationRegistry<FlyoutPage>(this));
-
-			this.Loaded += OnLoaded;
-			this.Unloaded += OnUnloaded;
+			(this as IControlsVisualElement).WindowChanged += OnWindowChanged;
+			this.SizeChanged += OnSizeChanged;
 		}
 
 		readonly Lazy<PlatformConfigurationRegistry<FlyoutPage>> _platformConfigurationRegistry;
@@ -319,15 +318,26 @@ public FlyoutPage()
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
 
-		void OnUnloaded(object sender, EventArgs e)
+		void OnSizeChanged(object sender, EventArgs e)
 		{
-			DeviceDisplay.MainDisplayInfoChanged -= OnMainDisplayInfoChanged;
+			if (Handler is not null)
+			{
+				Handler?.UpdateValue(nameof(FlyoutBehavior));
+				SizeChanged -= OnSizeChanged;
+			}
 		}
 
-		void OnLoaded(object sender, EventArgs e)
+		void OnWindowChanged(object sender, EventArgs e)
 		{
-			DeviceDisplay.MainDisplayInfoChanged += OnMainDisplayInfoChanged;
-			Handler?.UpdateValue(nameof(FlyoutBehavior));
+			if (Window is null)
+			{
+				this.SizeChanged += OnSizeChanged;
+				DeviceDisplay.MainDisplayInfoChanged -= OnMainDisplayInfoChanged;
+			}
+			else
+			{
+				DeviceDisplay.MainDisplayInfoChanged += OnMainDisplayInfoChanged;
+			}
 		}
 
 		void OnMainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)