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

.ide IDE now using SplitterFrame instead of Splitter to handle workspace. #1771 (Please revert Mirek if you find this code as a complete disaster).

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11295 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2017-08-07 19:55:40 +00:00
parent 603286af25
commit 4f6cda4d76
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/ide/Config.cpp
View file

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

7
uppsrc/ide/ide.h
View file

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

2
uppsrc/ide/idebar.cpp
View file

@ -82,7 +82,7 @@ void Ide::File(Bar& menu)
}
menu.Add(AK_PACKAGESFILES, THISBACK(SwapPackagesFiles))
.Check(wesplit.GetZoom() != 1);
.Check(weframe.IsShown());
menu.MenuSeparator();

8
uppsrc/ide/idewin.cpp
View file

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