github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-21 22:04:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: fixed some edit mode issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7415 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-04 13:28:13 +00:00
parent f19e74293f
commit 4e3b601d57
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/ide/Config.cpp
View file

@ -117,13 +117,15 @@ bool Ide::IsEditorMode() const
void Ide::SaveLastMain()
{
if(main.GetCount())
StoreToFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
StoreToFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
}
void Ide::LoadLastMain()
{
bool editor = IsEditorMode();
LoadFromFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
if(editor)
main <<= Null;
}
void Sentinel(Stream& s, const char *txt)

8
uppsrc/ide/UppWspc.cpp
View file

@ -133,12 +133,12 @@ void WorkspaceWork::ScanWorkspace() {
package.Add(pk, Null, fnt, Nvl(pi.ink, SColorText()), false, 0, Null, SColorMark);
}
if(!organizer) {
if(main.GetCount()) {
if(main.GetCount())
package.Add(prjaux, IdeImg::PrjAux(), ListFont(), Magenta);
package.Add(METAPACKAGE, IdeImg::Meta(), ListFont(), Red);
}
package.Add(tempaux, IdeImg::TempAux(), ListFont(), Magenta);
package.Add(ideaux, IdeImg::IdeAux(), ListFont(), Magenta);
package.Add(tempaux, IdeImg::TempAux(), ListFont(), Magenta);
if(main.GetCount())
package.Add(METAPACKAGE, IdeImg::Meta(), ListFont(), Red);
}
package.SetCursor(0);

3
uppsrc/ide/idewin.cpp
View file

@ -944,8 +944,7 @@ void AppMain___()
Ini::user_log = true;
}
if(!ide.IsEditorMode())
ide.LoadLastMain();
ide.LoadLastMain();
if(clset || ide.OpenMainPackage()) {
ide.SaveLastMain();
ide.isscanning++;