From 191873264426e5f2b3efbb14f6bc25e467b8884a Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 15 Apr 2016 07:37:39 +0000
Subject: [PATCH] Navigator moved out of split (RM issue #2)

git-svn-id: svn://ultimatepp.org/upp/trunk@9696 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Assist.cpp  |  1 -
 uppsrc/ide/Setup.cpp   | 11 +++++------
 uppsrc/ide/idefile.cpp |  1 -
 uppsrc/ide/idewin.cpp  |  4 +++-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index ceb808123..5c4845f45 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -50,7 +50,6 @@ AssistEditor::AssistEditor()
 	auto_assist = auto_check = true;
 	commentdp = false;
 
-	InsertFrame(1, navigatorframe);
 	navigatorframe.Left(navigatorpane, HorzLayoutZoom(140));
 	navigating = false;
 
diff --git a/uppsrc/ide/Setup.cpp b/uppsrc/ide/Setup.cpp
index 29ed2668e..9e20dbf20 100644
--- a/uppsrc/ide/Setup.cpp
+++ b/uppsrc/ide/Setup.cpp
@@ -143,7 +143,7 @@ void Ide::UpdateFormat(CodeEditor& editor)
 }
 
 void Ide::UpdateFormat() {
-	SetupEditor();	
+	SetupEditor();
 	UpdateFormat(editor);
 	UpdateFormat(editor2);
 	console.SetFont(consolefont);
@@ -151,19 +151,18 @@ void Ide::UpdateFormat() {
 	statusbar.Show(show_status_bar);
 	SetupBars();
 	
-	if(!designer) {
+	if(!designer)
 		if(filetabs >=0) {
 			tabs.SetAlign(filetabs);
 			editpane.SetFrame(tabs);
-		} else {
-			editpane.SetFrame(ViewFrame());
 		}
-	}
+		else
+			editpane.SetFrame(NullFrame());
 	
 	tabs.Grouping(tabs_grouping);
 	tabs.Stacking(tabs_stacking);
 	tabs.FileIcons(tabs_icons, false);
-	tabs.Crosses(tabs_crosses >= 0, tabs_crosses);	
+	tabs.Crosses(tabs_crosses >= 0, tabs_crosses);
 }
 
 void Ide::EditorFontScroll(int d)
diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp
index 83420d954..98202b7d2 100644
--- a/uppsrc/ide/idefile.cpp
+++ b/uppsrc/ide/idefile.cpp
@@ -379,7 +379,6 @@ void Ide::FlushFile() {
 	editor.Clear();
 	editor.Disable();
 	editorsplit.Ctrl::Remove();
-	editor.SetFrame(NullFrame());
 	designer.Clear();
 	SetBar();
 }
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 5b6da846f..602dae831 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -412,6 +412,8 @@ Ide::Ide()
 	editorsplit.Vert(editor, editor2);
 	editorsplit.Zoom(0);
 	SyncEditorSplit();
+	
+	editpane.AddFrame(editor.navigatorframe);
 
 	right_split.Horz(editpane, right);
 	right_split.Zoom(0);
@@ -457,7 +459,7 @@ Ide::Ide()
 	editor.topsbbutton1.ScrollStyle().NoWantFocus().Show();
 	tabs <<= THISBACK(TabFile);
 //	tabs.WhenCloseRest = THISBACK1(CloseRest, &tabs);
-	editor2.SetFrame(NullFrame());
+//	editor2.SetFrame(NullFrame());
 	editor2.topsbbutton.ScrollStyle().NoWantFocus().Show();
 	editor2.topsbbutton1.ScrollStyle().NoWantFocus().Show();
 	editor2.WhenLeftDown = THISBACK(SwapEditors);