diff options
| author | Jorge Arellano Cid <jcid@dillo.org> | 2010-10-08 13:06:12 -0400 |
|---|---|---|
| committer | Jorge Arellano Cid <jcid@dillo.org> | 2010-10-08 13:06:12 -0400 |
| commit | 92e317196f25d426146bc355e604616c24d10d2a (patch) | |
| tree | c7fcd4c46d9e0ee3eaa247a197576b35420ba4e3 | |
| parent | cd0d22cd6825c04469f95f1bc9f99b2a7226fe82 (diff) | |
Don't touch letter spacing for small-caps
| -rw-r--r-- | dw/fltkplatform.cc | 6 | ||||
| -rw-r--r-- | dw/fltkviewbase.cc | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc index bd6209a0..85b22507 100644 --- a/dw/fltkplatform.cc +++ b/dw/fltkplatform.cc @@ -361,9 +361,7 @@ int FltkPlatform::textWidth (core::style::Font *font, const char *text, int curr = 0, next = 0, nb; if (font->fontVariant == 1) { - int sc_fontsize, sc_letterSpacing; - sc_fontsize = lout::misc::roundInt(ff->size * 0.78); - sc_letterSpacing = lout::misc::roundInt(font->letterSpacing * 0.78); + int sc_fontsize = lout::misc::roundInt(ff->size * 0.78); memset (&st1, '\0', sizeof (mbstate_t)); memset (&st2, '\0', sizeof (mbstate_t)); for (curr = 0; next < len; curr = next) { @@ -378,7 +376,7 @@ int FltkPlatform::textWidth (core::style::Font *font, const char *text, /* make utf8 string for converted char */ nb = wcrtomb(chbuf, wcu, &st2); setfont(ff->font, sc_fontsize); - width += sc_letterSpacing; + width += font->letterSpacing; width += (int)getwidth(chbuf, nb); } } diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc index d8942ccf..123af5b3 100644 --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -498,9 +498,7 @@ void FltkWidgetView::drawText (core::style::Font *font, mbstate_t st1, st2; if (font->fontVariant == 1) { - int sc_fontsize, sc_letterSpacing; - sc_fontsize = lout::misc::roundInt(ff->size * 0.78); - sc_letterSpacing = lout::misc::roundInt(font->letterSpacing * 0.78); + int sc_fontsize = lout::misc::roundInt(ff->size * 0.78); memset (&st1, '\0', sizeof (mbstate_t)); memset (&st2, '\0', sizeof (mbstate_t)); for (curr = 0; next < len; curr = next) { @@ -517,7 +515,7 @@ void FltkWidgetView::drawText (core::style::Font *font, int n = wcrtomb(chbuf, wcu, &st2); setfont(ff->font, sc_fontsize); drawtext(chbuf, n, viewX, viewY); - viewX += sc_letterSpacing; + viewX += font->letterSpacing; viewX += (int)getwidth(chbuf, n); } } |