diff --git a/uppsrc/ide/Config.cpp b/uppsrc/ide/Config.cpp index 41e0f7c0d..69a18c279 100644 --- a/uppsrc/ide/Config.cpp +++ b/uppsrc/ide/Config.cpp @@ -170,7 +170,7 @@ void Sentinel(Stream& s, const char *txt) void Ide::Serialize(Stream& s) { - int version = 11; + int version = 12; Sentinel(s, "before 12341234"); s.Magic(0x12341234); Sentinel(s, "after magic"); @@ -183,7 +183,12 @@ void Ide::Serialize(Stream& s) s % AnyPackageFs(); Sentinel(s, "after AnyPackageFs"); s % pfsplit; - s % wesplit; + if (version >= 12) + s % weframe; + else { + Splitter dummy; + s % dummy; + } package.SerializeSettings(s); filelist.SerializeSettings(s); s % editorfont; diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h index 1dce66cd6..1a229232c 100644 --- a/uppsrc/ide/ide.h +++ b/uppsrc/ide/ide.h @@ -462,9 +462,10 @@ public: FileOut stdout_fout; - Splitter editorsplit; - Splitter pfsplit; - Splitter wesplit; + Splitter editorsplit; + Splitter pfsplit; + StaticRect wepane; + SplitterFrame weframe; Splitter right_split; StaticRect right; diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp index 797cd8cad..7dea51962 100644 --- a/uppsrc/ide/idebar.cpp +++ b/uppsrc/ide/idebar.cpp @@ -82,7 +82,7 @@ void Ide::File(Bar& menu) } menu.Add(AK_PACKAGESFILES, THISBACK(SwapPackagesFiles)) - .Check(wesplit.GetZoom() != 1); + .Check(weframe.IsShown()); menu.MenuSeparator(); diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp index 7f532ee2c..e15859fdd 100644 --- a/uppsrc/ide/idewin.cpp +++ b/uppsrc/ide/idewin.cpp @@ -56,7 +56,7 @@ void Ide::ToggleStopOnErrors() { void Ide::SwapPackagesFiles() { - wesplit.Zoom(wesplit.GetZoom() == 1 ? -1 : 1); + weframe.Show(weframe.IsShown() ? false : true); } void IdePutErrorLine(const String& line) @@ -456,9 +456,9 @@ Ide::Ide() pfsplit.SetPos(2000); pfsplit.Vert(package, filelist); - wesplit.Horz(pfsplit, editor_bottom); - wesplit.SetPos(2000); - Add(wesplit); + wepane.Add(editor_bottom.SizePos()); + wepane.AddFrame(weframe.Left(pfsplit, HorzLayoutZoom(280))); + Add(wepane.SizePos()); editor.topsbbutton.ScrollStyle().NoWantFocus().Show(); editor.topsbbutton1.ScrollStyle().NoWantFocus().Show();