github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Fixed issue with bool serialization

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15020 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-09-12 08:39:41 +00:00
parent 174a032126
commit 2d9df592b2
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Stream.h
View file

@ -198,7 +198,7 @@ public:
Stream& SerializeRaw(dword *data) { if(IsLoading()) *data = Get32le(); else Put32le(*data); return *this; }
Stream& SerializeRaw(uint64 *data) { if(IsLoading()) *data = Get64le(); else Put64le(*data); return *this; }
Stream& operator%(bool& d) { return SerializeRaw((byte *)&d); }
Stream& operator%(bool& d) { byte b = d; SerializeRaw(&b); d = b; return *this; }
Stream& operator%(char& d) { return SerializeRaw((byte *)&d); }
Stream& operator%(signed char& d) { return SerializeRaw((byte *)&d); }
Stream& operator%(unsigned char& d) { return SerializeRaw((byte *)&d); }

7
uppsrc/ide/Insert.cpp
View file

@ -307,8 +307,15 @@ void Ide::InsertInclude(Bar& bar)
void Ide::ToggleWordwrap()
{
RLOG("===========");
RDUMPHEX((int)*(byte *)&wordwrap);
RDUMP(wordwrap);
wordwrap = !wordwrap;
RDUMPHEX((int)*(byte *)&wordwrap);
RDUMP(wordwrap);
SetupEditor();
RDUMP(wordwrap);
RLOG(".........");
}
void Ide::EditorMenu(Bar& bar)

4
uppsrc/ide/ide.h
View file

@ -601,8 +601,8 @@ public:
bool auto_rescan;
bool auto_check;
int spellcheck_comments;
bool wordwrap_comments;
bool wordwrap;
bool wordwrap_comments = true;
bool wordwrap = false;
bool setmain_newide;
bool gui_font_override = false;
Font gui_font = StdFont();