From c2458d3d3a7f1ce309861e237fa52c13b7342e34 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sun, 29 Sep 2019 14:52:21 +0200 Subject: [PATCH] label[]: Fix broken colors since 2c9edef --- src/gui/guiFormSpecMenu.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index ebcc6b67e..9dacf37d7 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -1405,8 +1405,10 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element) std::vector lines = split(text, '\n'); for (unsigned int i = 0; i != lines.size(); i++) { - std::wstring wlabel = unescape_translate(unescape_string( - utf8_to_wide(lines[i]))); + std::wstring wlabel_colors = translate_string( + utf8_to_wide(unescape_string(lines[i]))); + // Without color escapes to get the font dimensions + std::wstring wlabel_plain = unescape_enriched(wlabel_colors); core::rect rect; @@ -1423,7 +1425,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element) rect = core::rect( pos.X, pos.Y, - pos.X + m_font->getDimension(wlabel.c_str()).Width, + pos.X + m_font->getDimension(wlabel_plain.c_str()).Width, pos.Y + imgsize.Y); } else { @@ -1445,13 +1447,13 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element) rect = core::rect( pos.X, pos.Y - m_btn_height, - pos.X + m_font->getDimension(wlabel.c_str()).Width, + pos.X + m_font->getDimension(wlabel_plain.c_str()).Width, pos.Y + m_btn_height); } FieldSpec spec( "", - wlabel, + wlabel_colors, L"", 258+m_fields.size() );