diff --git a/src/driver/fb_window.cpp b/src/driver/fb_window.cpp index a39aa05e9..8d6ddfa23 100644 --- a/src/driver/fb_window.cpp +++ b/src/driver/fb_window.cpp @@ -62,7 +62,7 @@ bool CFBWindow::paintIcon(const char * const _filename, const int _x, const int return 0; } -void CFBWindow::RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight, const bool _utf8_encoded) +void CFBWindow::RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight, const unsigned int _flags) { - ((Font *)_font)->RenderString(x + _x, y + _y, _width, _text, _color, _boxheight, _utf8_encoded); + ((Font *)_font)->RenderString(x + _x, y + _y, _width, _text, _color, _boxheight, _flags); } diff --git a/src/driver/fb_window.h b/src/driver/fb_window.h index 9e4a0b347..0f9cf8a49 100644 --- a/src/driver/fb_window.h +++ b/src/driver/fb_window.h @@ -44,7 +44,7 @@ class CFBWindow void paintBoxRel(const int _x, const int _y, const int _dx, const int _dy, const color_t _col, int radius = 0, int type = 0xF); bool paintIcon(const char * const _filename, const int _x, const int _y, const int _h = 0, const color_t _offset = 1); - void RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight = 0, const bool _utf8_encoded = false); + void RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight = 0, const unsigned int _flags = Font::IS_UTF8); }; #endif /* __fb_window_h__ */ diff --git a/src/driver/fontrenderer.h b/src/driver/fontrenderer.h index 6c4ced71e..7a67b68f9 100644 --- a/src/driver/fontrenderer.h +++ b/src/driver/fontrenderer.h @@ -71,11 +71,11 @@ class Font FULLBG = 2 }; - void RenderString(int x, int y, const int width, const char * text, const fb_pixel_t color, const int boxheight = 0, const unsigned int flags = 0); - void RenderString(int x, int y, const int width, const std::string & text, const fb_pixel_t color, const int boxheight = 0, const unsigned int flags = 0); + void RenderString(int x, int y, const int width, const char * text, const fb_pixel_t color, const int boxheight = 0, const unsigned int flags = IS_UTF8); + void RenderString(int x, int y, const int width, const std::string & text, const fb_pixel_t color, const int boxheight = 0, const unsigned int flags = IS_UTF8); - int getRenderWidth(const char * text, const bool utf8_encoded = false); - int getRenderWidth(const std::string & text, const bool utf8_encoded = false); + int getRenderWidth(const char * text, const bool utf8_encoded = true); + int getRenderWidth(const std::string & text, const bool utf8_encoded = true); int getHeight(void); int getDigitHeight(void); int getMaxDigitWidth(void);