Merge pull request #7838 from mono/fix910879-new-editor-splitview

[Ide] Use regular Gtk.HPaned for split view with the new editor

1 files changed, 11 insertions, 2 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookContainer.cs
index 5de2ec2472..71019c3cfc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookContainer.cs
@@ -224,10 +224,19 @@ namespace MonoDevelop.Components.DockNotebook
 			return newNotebook;
 		}
 
+		static HPaned CreatePaned ()
+		{
+			// FIXME: Bug #910879: HPanedThin is not functional with the new editor,
+			//        fall-back to the regular Gtk paned until we find the right solution
+			if (Ide.Editor.DefaultSourceEditorOptions.Instance.EnableNewEditor)
+				return new HPaned ();
+			return new HPanedThin { GrabAreaSize = 6 };
+		}
+
 		public DockNotebook InsertLeft (SdiWorkspaceWindow window)
 		{
 			return Insert (window, container => {
-				var box = new HPanedThin { GrabAreaSize = 6 };
+				var box = CreatePaned ();
 				var new_container = new DockNotebookContainer (tabControl);
 
 				box.Pack1 (container, true, true);
@@ -239,7 +248,7 @@ namespace MonoDevelop.Components.DockNotebook
 		public DockNotebook InsertRight (SdiWorkspaceWindow window)
 		{
 			return Insert (window, container => {
-				var box = new HPanedThin () { GrabAreaSize = 6 };
+				var box = CreatePaned ();
 				var new_container = new DockNotebookContainer (tabControl);
 
 				box.Pack1 (new_container, true, true);