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

.pdfdraw

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5599 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-11-30 08:00:32 +00:00
parent c3e23d3a63
commit 7dd5d6058e
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
uppsrc/PdfDraw/PdfDraw.cpp
View file

@ -108,7 +108,7 @@ void PdfDraw::PutRGColor(Color RG)
void PdfDraw::PutLineWidth(int lw)
{
lw = max(Nvl(lw, 0), 5);
lw = max(Nvl(lw, 0), 1);
if(linewidth != lw)
page << Pt(linewidth = lw) << " w\n";
}
@ -277,6 +277,10 @@ enum { FONTHEIGHT_TTF = -9999 };
void PdfDraw::DrawTextOp(int x, int y, int angle, const wchar *s, Font fnt,
Color ink, int n, const int *dx)
{
// DLOG("------------------");
// DDUMP(fnt);
// DDUMP(GetTextSize(s, fnt, n).cx);
// DDUMP(WString(s, n));
if(!n) return;
if(fnt.GetHeight() == 0)
fnt.Height(100);
@ -360,9 +364,14 @@ void PdfDraw::DrawTextOp(int x, int y, int angle, const wchar *s, Font fnt,
}
page << "ET\n";
}
// DrawRect(x + posx, y, 20, 20, Black()); _DBG_
if(fnt.IsUnderline()) {
int w = ff.GetAscent() / 15;
int dy = ff.GetAscent() + max((ff.GetDescent() - w) / 2, ff.GetAscent() / 10);
int w = max(2, ff.GetAscent() / 25);
int dy = ff.GetAscent() + min(ff.GetDescent() - w, 2 * w);
// DDUMP(posx);
// DDUMP(dy);
// DDUMP(ff.GetAscent());
// DDUMP(w);
DrawLine(fround(x + sina * dy),
fround(y + cosa * dy),
fround(x + cosa * posx + sina * dy),