github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Navigator moved out of split (RM issue #2)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9696 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-04-15 07:37:39 +00:00
parent 085116f7b5
commit 1918732644
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/ide/Assist.cpp
View file

@ -50,7 +50,6 @@ AssistEditor::AssistEditor()
auto_assist = auto_check = true;
commentdp = false;
InsertFrame(1, navigatorframe);
navigatorframe.Left(navigatorpane, HorzLayoutZoom(140));
navigating = false;

11
uppsrc/ide/Setup.cpp
View file

@ -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)

1
uppsrc/ide/idefile.cpp
View file

@ -379,7 +379,6 @@ void Ide::FlushFile() {
editor.Clear();
editor.Disable();
editorsplit.Ctrl::Remove();
editor.SetFrame(NullFrame());
designer.Clear();
SetBar();
}

4
uppsrc/ide/idewin.cpp
View file

@ -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);