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

Developing new draw

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1362 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-07-05 19:55:03 +00:00
parent 4219da1896
commit d1c50c8278
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlLib/ColumnList.cpp
View file

@ -651,7 +651,7 @@ int ColumnList::RoundedCy()
Rect r = GetRect();
Rect rr = r;
frame->FrameLayout(r);
return r.Height() / cy * cy + rr.Height() - r.Height();
return (cy ? r.Height() / cy * cy : 0) + rr.Height() - r.Height();
}
void ColumnList::FrameLayout(Rect& r)

7
uppsrc/RichText/EncodeRTF.cpp
View file

@ -398,9 +398,12 @@ void RTFEncoder::PutHeader()
Group fnt(this, "f", i);
int fn = used_faces[i];
dword info = Font::GetFaceInfo(fn);
if(info & Font::SYMBOLTYPE)
#ifdef PLATFORM_WIN32
if(fn == Font::SYMBOL)
Command("ftech");
else if(info & Font::FIXEDPITCH)
else
#endif
if(info & Font::FIXEDPITCH)
Command("fmodern");
else if(fn == Font::ROMAN)
Command("froman");