nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the byte size for utf strings, not the character size

Browse source
This commit is contained in:
Dana Jansens 2003-01-13 10:33:16 +00:00
parent ffb237bf40
commit 7f2ee77204
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
otk/font.cc
View file

@ -97,11 +97,11 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
if (string.utf8()) if (string.utf8())
XftDrawStringUtf8(d, &c, _xftfont, x + _offset, XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset, _xftfont->ascent + y + _offset,
(FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.bytes());
else else
XftDrawString8(d, &c, _xftfont, x + _offset, XftDrawString8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset, _xftfont->ascent + y + _offset,
(FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.bytes());
} }
XftColor c; XftColor c;
@ -113,10 +113,10 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
if (string.utf8()) if (string.utf8())
XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y, XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
(FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.bytes());
else else
XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y, XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
(FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.bytes());
return; return;
} }
@ -128,10 +128,10 @@ unsigned int Font::measureString(const ustring &string) const
if (string.utf8()) if (string.utf8())
XftTextExtentsUtf8(**display, _xftfont, XftTextExtentsUtf8(**display, _xftfont,
(FcChar8*)string.c_str(), string.size(), &info); (FcChar8*)string.c_str(), string.bytes(), &info);
else else
XftTextExtents8(**display, _xftfont, XftTextExtents8(**display, _xftfont,
(FcChar8*)string.c_str(), string.size(), &info); (FcChar8*)string.c_str(), string.bytes(), &info);
return info.xOff + (_shadow ? _offset : 0); return info.xOff + (_shadow ? _offset : 0);
} }