From 7ba34614bdb823e57ae4eca21f129b0e48972354 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Thu, 28 Sep 2017 10:29:26 +0300 Subject: [PATCH] freetype fonts support enhancement, fix #464 --- src/dlangui/core/types.d | 2 +- src/dlangui/graphics/fonts.d | 2 +- src/dlangui/graphics/ftfonts.d | 2 ++ views/DLANGUI_VERSION | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dlangui/core/types.d b/src/dlangui/core/types.d index 2e41e65b..806436c7 100644 --- a/src/dlangui/core/types.d +++ b/src/dlangui/core/types.d @@ -356,7 +356,7 @@ struct Glyph /// 0: width of glyph black box ushort blackBoxX; - @property ushort correctedBlackBoxX() { return subpixelMode ? blackBoxX / 3 : blackBoxX; } + @property ushort correctedBlackBoxX() { return subpixelMode ? (blackBoxX + 2) / 3 : blackBoxX; } /// 2: height of glyph black box diff --git a/src/dlangui/graphics/fonts.d b/src/dlangui/graphics/fonts.d index f5f50568..d6883b17 100644 --- a/src/dlangui/graphics/fonts.d +++ b/src/dlangui/graphics/fonts.d @@ -226,7 +226,7 @@ class Font : RefCountedObject { uint len = cast(uint)text.length; if (widths.length < len) widths.length = len + 1; - bool useKerning = allowKerning; + bool useKerning = allowKerning && family != FontFamily.MonoSpace; int x = 0; int charsMeasured = 0; int * pwidths = widths.ptr; diff --git a/src/dlangui/graphics/ftfonts.d b/src/dlangui/graphics/ftfonts.d index 5a8b1172..b1aed796 100644 --- a/src/dlangui/graphics/ftfonts.d +++ b/src/dlangui/graphics/ftfonts.d @@ -261,6 +261,8 @@ class FreeTypeFontFile { ubyte h = cast(ubyte)(bitmap.rows); glyph.blackBoxX = w; glyph.blackBoxY = h; + glyph.originX = cast(byte)(_slot.bitmap_left); + glyph.originY = cast(byte)(_slot.bitmap_top); int sz = w * cast(int)h; if (sz > 0) { glyph.glyph = new ubyte[sz]; diff --git a/views/DLANGUI_VERSION b/views/DLANGUI_VERSION index 62d6e647..d74ff4a1 100644 --- a/views/DLANGUI_VERSION +++ b/views/DLANGUI_VERSION @@ -1 +1 @@ -v0.9.152 \ No newline at end of file +v0.9.153 \ No newline at end of file