Mac: Fix some events not firing properly

picoe · Jun 14, 2024 · ca04643 · ca04643
1 parent 827b245
commit ca04643
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Eto.Mac/Forms/MacBase.cs b/src/Eto.Mac/Forms/MacBase.cs
@@ -38,7 +38,7 @@ public class ObserverHelper : NSObject
 
 		public IntPtr ControlHandle { get; set; }
 
-		public NSObject Control => Runtime.TryGetNSObject(ControlHandle);
+		public NSObject Control => Runtime.GetNSObject(ControlHandle);
 
 		WeakReference handler;
 
@@ -72,20 +72,30 @@ void AddToNotificationCenter()
 			var c = Control;
 			if (!hasNotification && c != null)
 			{
+				// Console.WriteLine($"Adding notification center observer for {KeyPath}, Handler: {Handler?.GetType()}, Control: {c.GetType()}");
 				NSNotificationCenter.DefaultCenter.AddObserver(this, selPerformAction, KeyPath, c);
 				hasNotification = true;
 			}
+			else if (!hasNotification)
+			{
+				Debug.WriteLine($"WARNING: Could not add notification center observer for {KeyPath}, Handler: {Handler?.GetType()}. {ControlHandle} points to a null object");
+			}
+
 		}
 
 		void AddToControl()
 		{
 			var c = Control;
 			if (!hasControl && c != null)
 			{
-				//Console.WriteLine ("{0}: 3. Adding observer! {1}, {2}", ((IRef)this.Handler).WidgetID, this.GetType (), Control.GetHashCode ());
+				// Console.WriteLine($"Adding control observer for {KeyPath}, Handler: {Handler?.GetType()}, Control: {c.GetType()}");
 				c.AddObserver(this, KeyPath, NSKeyValueObservingOptions.New, IntPtr.Zero);
 				hasControl = true;
 			}
+			else if (!hasNotification)
+			{
+				Debug.WriteLine($"WARNING: Could not add control observer for {KeyPath}, Handler: {Handler?.GetType()}. {ControlHandle} points to a null object");
+			}
 		}
 
 		static readonly IntPtr selRemoveObserverForKeyPath_Handle = Selector.GetHandle("removeObserver:forKeyPath:");

diff --git a/src/Eto.Mac/Forms/MacView.cs b/src/Eto.Mac/Forms/MacView.cs
@@ -642,7 +642,7 @@ public abstract partial class MacView<TControl, TWidget, TCallback> : MacObject<
 
 		public virtual IEnumerable<Control> VisualControls => Enumerable.Empty<Control>();
 
-		internal override bool DelayRegisterNotificationCenter => true;
+		internal override bool DelayRegisterNotificationCenter => Widget?.Loaded != true;
 
 		protected virtual Size DefaultMinimumSize => Size.Empty;