github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Syncing uppdev

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2149 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-02-25 06:52:15 +00:00
commit da75b7aaa6
9 changed files with 63 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
uppdev/rtftest/rtftest.cpp
View file

@ -34,16 +34,21 @@ static void PaintLegend(Draw& draw, Rect& outer, const Vector<String>& linie, bo
fmt.Face(Font::ARIAL).Height(TEXT_HT);
for(int o = 0; o < order.GetCount(); o++) {
String l = linie[order[o]];
String ltext = l;
WString ltext = l.ToWString();
DrawingDraw ddraw(LINE_WD, TEXT_HT);
ddraw.DrawLine(0, TEXT_HT / 2, LINE_WD, TEXT_HT / 2, 5, LtGreen());
if(o)
legend_para.Cat("\xA0\xA0\xA0 ", fmt);
if(o) {
legend_para.Cat(WString(0xa0, 1), fmt);
legend_para.Cat(WString(0xa0, 1), fmt);
legend_para.Cat(WString(0xa0, 1), fmt);
legend_para.Cat(WString(' ', 1), fmt);
}
legend_para.Cat(CreateDrawingObject(ddraw, LINE_WD, TEXT_HT), fmt);
legend_para.Cat("\xA0\xA0", fmt);
legend_para.Cat(WString(0xa0, 1), fmt);
legend_para.Cat(WString(0xa0, 1), fmt);
for(int i = 0; i < ltext.GetLength(); i++)
if(ltext[i] == ' ')
ltext.Set(i, 0xA0);
@ -53,6 +58,8 @@ static void PaintLegend(Draw& draw, Rect& outer, const Vector<String>& linie, bo
rtext.Cat(legend_para);
rtext.Normalize();
DDUMP(AsQTF(rtext));
int wd = min(rtext.GetWidth(), outer.Width() - 2 * LEG_INNER_GAP);
int ht = rtext.GetHeight(wd);