forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix and optimization for monospace fonts - additional fix for #464

This commit is contained in:
Vadim Lopatin 2017-09-28 11:00:33 +03:00
parent 7e4c8accbb
commit 6dd1791490
2 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/dlangui/graphics/fonts.d
View File

@ -133,6 +133,14 @@ immutable int MAX_WIDTH_UNSPECIFIED = int.max;
* Use FontManager.instance.getFont() to retrieve font instance. * Use FontManager.instance.getFont() to retrieve font instance.
*/ */
class Font : RefCountedObject { class Font : RefCountedObject {
this() {
_textSizeBuffer.reserve(100);
_textSizeBuffer.assumeSafeAppend();
}
~this() { clear(); }
/// returns font size (as requested from font engine) /// returns font size (as requested from font engine)
abstract @property int size(); abstract @property int size();
/// returns actual font height including interline space /// returns actual font height including interline space
@ -224,13 +232,18 @@ class Font : RefCountedObject {
return 0; return 0;
const dchar * pstr = text.ptr; const dchar * pstr = text.ptr;
uint len = cast(uint)text.length; uint len = cast(uint)text.length;
if (widths.length < len) if (widths.length < len) {
widths.length = len + 1; widths.assumeSafeAppend;
bool useKerning = allowKerning && family != FontFamily.MonoSpace; widths.length = len + 16;
}
bool fixed = isFixed;
bool useKerning = allowKerning && !fixed;
int fixedCharWidth = charWidth('M');
int x = 0; int x = 0;
int charsMeasured = 0; int charsMeasured = 0;
int * pwidths = widths.ptr; int * pwidths = widths.ptr;
int tabWidth = spaceWidth * tabSize; // width of full tab in pixels int spWidth = fixed ? fixedCharWidth : spaceWidth;
int tabWidth = spWidth * tabSize; // width of full tab in pixels
tabOffset = tabOffset % tabWidth; tabOffset = tabOffset % tabWidth;
if (tabOffset < 0) if (tabOffset < 0)
tabOffset += tabWidth; tabOffset += tabWidth;
@ -241,7 +254,7 @@ class Font : RefCountedObject {
if (ch == '\t') { if (ch == '\t') {
// measure tab // measure tab
int tabPosition = (x + tabWidth - tabOffset) / tabWidth * tabWidth + tabOffset; int tabPosition = (x + tabWidth - tabOffset) / tabWidth * tabWidth + tabOffset;
while (tabPosition < x + spaceWidth) while (tabPosition < x + spWidth)
tabPosition += tabWidth; tabPosition += tabWidth;
pwidths[i] = tabPosition; pwidths[i] = tabPosition;
charsMeasured = i + 1; charsMeasured = i + 1;
@ -253,28 +266,35 @@ class Font : RefCountedObject {
prevChar = 0; prevChar = 0;
continue; // skip '&' in hot key when measuring continue; // skip '&' in hot key when measuring
} }
Glyph * glyph = getCharGlyph(pstr[i], true); // TODO: what is better if (fixed) {
//auto measureEnd = std.datetime.Clock.currAppTick; // fast calculation for fixed pitch
//auto duration = measureEnd - measureStart; x += fixedCharWidth;
//if (duration.length > 10)
// Log.d("ft measureText took ", duration.length, " ticks");
if (glyph is null) {
// if no glyph, use previous width - treat as zero width
pwidths[i] = x; pwidths[i] = x;
prevChar = 0; charsMeasured = i + 1;
continue; } else {
Glyph * glyph = getCharGlyph(pstr[i], true); // TODO: what is better
//auto measureEnd = std.datetime.Clock.currAppTick;
//auto duration = measureEnd - measureStart;
//if (duration.length > 10)
// Log.d("ft measureText took ", duration.length, " ticks");
if (glyph is null) {
// if no glyph, use previous width - treat as zero width
pwidths[i] = x;
prevChar = 0;
continue;
}
int kerningDelta = useKerning && prevChar ? getKerningOffset(ch, prevChar) : 0;
int width = ((glyph.widthScaled + kerningDelta + 63) >> 6);
if (width < glyph.originX + glyph.correctedBlackBoxX)
width = glyph.originX + glyph.correctedBlackBoxX;
int w = x + width; // using advance
//int w2 = x + glyph.originX + glyph.correctedBlackBoxX; // using black box
//if (w < w2) // choose bigger value
// w = w2;
pwidths[i] = w;
x += width;
charsMeasured = i + 1;
} }
int kerningDelta = useKerning && prevChar ? getKerningOffset(ch, prevChar) : 0;
int width = ((glyph.widthScaled + kerningDelta + 63) >> 6);
if (width < glyph.originX + glyph.correctedBlackBoxX)
width = glyph.originX + glyph.correctedBlackBoxX;
int w = x + width; // using advance
//int w2 = x + glyph.originX + glyph.correctedBlackBoxX; // using black box
//if (w < w2) // choose bigger value
// w = w2;
pwidths[i] = w;
x += width;
charsMeasured = i + 1;
if (x > maxWidth) if (x > maxWidth)
break; break;
prevChar = ch; prevChar = ch;
@ -480,7 +500,6 @@ class Font : RefCountedObject {
void clear() {} void clear() {}
~this() { clear(); }
} }
alias FontRef = Ref!Font; alias FontRef = Ref!Font;

2
views/DLANGUI_VERSION
View File

@ -1 +1 @@
v0.9.153 v0.9.154