fly/flightgear
1
0
Fork 0
Code Activity

Fix accent bug in MapWidget

Browse source
This commit is contained in:
Clément de l'Hamaide 2013-12-01 18:50:44 +01:00
parent e8f4e25c8c
commit efdb488736
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/GUI/MapWidget.cxx
View file

@ -199,6 +199,11 @@ public:
_width, _height); _width, _height);
} }
void drawStringUtf8(std::string& utf8Str, double x, double y, puFont fnt)
{
fnt.drawString(simgear::strutils::utf8ToLatin1(utf8Str).c_str(), x, y);
}
void draw() void draw()
{ {
validate(); validate();
@ -218,12 +223,12 @@ public:
glColor3f(0.8, 0.8, 0.8); glColor3f(0.8, 0.8, 0.8);
for (unsigned int ln=0; ln<_lines.size(); ++ln) { for (unsigned int ln=0; ln<_lines.size(); ++ln) {
_font.drawString(_lines[ln].c_str(), xPos, yPos); drawStringUtf8(_lines[ln], xPos, yPos, _font);
yPos -= lineHeight + LINE_LEADING; yPos -= lineHeight + LINE_LEADING;
} }
} else { } else {
glColor3f(0.8, 0.8, 0.8); glColor3f(0.8, 0.8, 0.8);
_font.drawString(_label.c_str(), xx, yy + _fontDescender); drawStringUtf8(_label, xx, yy + _fontDescender, _font);
} }
} }