Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bitmap: Make 'Bitmap::textSize()' work with multibyte characters

This commit is contained in:
Jonas Kulla 2013-10-20 22:14:38 +02:00
parent d63c8cdc19
commit dcdfea55f1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bitmap.cpp
View File

@ -28,6 +28,9 @@
#include "pixman.h"
#include <QString>
#include <QChar>
#include "gl-util.h"
#include "quad.h"
#include "quadarray.h"
@ -949,9 +952,10 @@ IntRect Bitmap::textSize(const char *str)
int w, h;
TTF_SizeUTF8(font, str, &w, &h);
// FIXME: This doesn't detect multibyte glyphs correctly
if (p->font->getItalic() && strlen(str) == 1)
TTF_GlyphMetrics(font, *str, 0, 0, 0, 0, &w);
QString qstr = QString::fromUtf8(str);
if (p->font->getItalic() && qstr.length() == 1)
TTF_GlyphMetrics(font, qstr.at(0).unicode(), 0, 0, 0, 0, &w);
return IntRect(0, 0, w, h);
}