Merge pull request mono#8874 from mono/pr-david-dispose

Fix 997787 and Fix 992438
xmonader · Oct 10, 2019 · 6db2d57 · 6db2d57
2 parents b3b3564 + d7b7b6b
commit 6db2d57
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/CocoaTextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/CocoaTextViewContent.cs
@@ -93,7 +93,10 @@ public ManagedGtkNSViewHostControl (ICocoaTextViewHost textViewHost)
 				if (textViewHost == null)
 					throw new ArgumentNullException (nameof (textViewHost));
 
-				GtkView = new Gtk.GtkNSViewHost (textViewHost.HostControl);
+				GtkView = new Gtk.GtkNSViewHost (
+					textViewHost.HostControl,
+					disposeViewOnGtkDestroy: true);
+
 				GtkView.Show ();
 			}
 

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/GtkNSViewHost.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/GtkNSViewHost.cs
@@ -77,11 +77,18 @@ static NSEvent GetNSEvent (Gdk.Event evnt)
 
 		NSView view;
 		NSView superview;
+		bool disposeViewOnGtkDestroy;
 		bool sizeAllocated;
 
 		public GtkNSViewHost (NSView view)
+			: this (view, disposeViewOnGtkDestroy: false)
+		{
+		}
+
+		public GtkNSViewHost (NSView view, bool disposeViewOnGtkDestroy)
 		{
 			this.view = view ?? throw new ArgumentNullException (nameof (view));
+			this.disposeViewOnGtkDestroy = disposeViewOnGtkDestroy;
 
 			WidgetFlags |= WidgetFlags.NoWindow;
 
@@ -151,6 +158,10 @@ protected override void OnDestroyed ()
 			LogEnter ();
 			try {
 				view?.RemoveFromSuperview ();
+
+				if (disposeViewOnGtkDestroy)
+					view?.Dispose ();
+
 				view = null;
 				superview = null;