Semi-workaround for wrong text_extents on non-Windows. Better but still not perfect calculation.

Originally committed to SVN as r1495.
This commit is contained in:
Niels Martin Hansen 2007-08-16 16:02:52 +00:00
parent 0c7e929f13
commit a7e05ff1c8
1 changed files with 10 additions and 8 deletions

View File

@ -146,24 +146,26 @@ namespace Automation4 {
for (unsigned int i = 0; i < text.length(); i++) { for (unsigned int i = 0; i < text.length(); i++) {
int a, b, c, d; int a, b, c, d;
thedc.GetTextExtent(text[i], &a, &b, &c, &d); thedc.GetTextExtent(text[i], &a, &b, &c, &d);
width += a + spacing; double scaling = fontsize / (double)(b>0?b:1); // semi-workaround for missing OS/2 table data for scaling
height = b > height ? b : height; width += (a + spacing)*scaling;
descent = c > descent ? c : descent; height = b > height ? b*scaling : height;
extlead= d > extlead ? d : extlead; descent = c > descent ? c*scaling : descent;
extlead = d > extlead ? d*scaling : extlead;
} }
} else { } else {
// If the inter-character spacing should be zero, kerning info can (and must) be used, so calculate everything in one go // If the inter-character spacing should be zero, kerning info can (and must) be used, so calculate everything in one go
long lwidth, lheight, ldescent, lextlead; long lwidth, lheight, ldescent, lextlead;
thedc.GetTextExtent(text, &lwidth, &lheight, &ldescent, &lextlead); thedc.GetTextExtent(text, &lwidth, &lheight, &ldescent, &lextlead);
width = lwidth; height = lheight; descent = ldescent; extlead = lextlead; double scaling = fontsize / (double)(lheight>0?lheight:1); // semi-workaround for missing OS/2 table data for scaling
width = lwidth*scaling; height = lheight*scaling; descent = ldescent*scaling; extlead = lextlead*scaling;
} }
#endif #endif
// Compensate for scaling // Compensate for scaling
width = style->scalex / 100 * width / 64; width = style->scalex / 100 * width / 64;
height = style->scaley / 100 * height /64; height = style->scaley / 100 * height / 64;
descent = style->scaley / 100 * descent /64; descent = style->scaley / 100 * descent / 64;
extlead = style->scaley / 100 * extlead /64; extlead = style->scaley / 100 * extlead / 64;
return true; return true;
} }