diff options
Diffstat (limited to 'src/gfx_layout.h')
| -rw-r--r-- | src/gfx_layout.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gfx_layout.h b/src/gfx_layout.h index f66559e22..294b70311 100644 --- a/src/gfx_layout.h +++ b/src/gfx_layout.h @@ -16,6 +16,8 @@ #include "gfx_func.h" #include "core/smallmap_type.hpp" +#undef WITH_ICU + #ifdef WITH_ICU #include "layout/ParagraphLayout.h" #define ICU_FONTINSTANCE : public LEFontInstance @@ -125,10 +127,10 @@ class Layouter : public AutoDeleteSmallVector<ParagraphLayout::Line *, 4> { #endif /* WITH_ICU */ size_t AppendToBuffer(CharType *buff, const CharType *buffer_last, WChar c); - ParagraphLayout *GetParagraphLayout(CharType *buff); + ParagraphLayout *GetParagraphLayout(CharType *buff, CharType *buff_end, FontMap &fontMapping); CharType buffer[DRAW_STRING_BUFFER]; ///< Buffer for the text that is going to be drawn. - FontMap fonts; ///< The fonts needed for drawing. + SmallVector<Font *, 4> fonts; ///< The fonts needed for drawing. public: Layouter(const char *str, int maxw = INT32_MAX, TextColour colour = TC_FROMSTRING, FontSize fontsize = FS_NORMAL); |