diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2020-01-22 19:09:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 19:09:11 +0100 |
| commit | 1892ff3c0db23ccdf7b0f6dc83cb1bdf4579b4ec (patch) | |
| tree | c49c16a69e9c555141960b4bca22a88df9b17a61 /src/gui/guiFormSpecMenu.cpp | |
| parent | fab3f5f7c8ce0cbfc27e509f065e3f4cfe28c514 (diff) | |
| download | minetest-1892ff3c0db23ccdf7b0f6dc83cb1bdf4579b4ec.tar.gz minetest-1892ff3c0db23ccdf7b0f6dc83cb1bdf4579b4ec.tar.bz2 minetest-1892ff3c0db23ccdf7b0f6dc83cb1bdf4579b4ec.zip | |
StaticText/EnrichedString: Styling support (#9187)
* StaticText/EnrichedString: Styling support
* Fix tooltip fg/bgcolor
* Fix default color for substr(), add unittests
Diffstat (limited to 'src/gui/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index a91623f96..d03ce4516 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -3417,19 +3417,16 @@ void GUIFormSpecMenu::drawMenu() void GUIFormSpecMenu::showTooltip(const std::wstring &text, const irr::video::SColor &color, const irr::video::SColor &bgcolor) { - const std::wstring ntext = translate_string(text); - m_tooltip_element->setOverrideColor(color); - m_tooltip_element->setBackgroundColor(bgcolor); - setStaticText(m_tooltip_element, ntext.c_str()); + EnrichedString ntext(text); + ntext.setDefaultColor(color); + ntext.setBackground(bgcolor); + + setStaticText(m_tooltip_element, ntext); // Tooltip size and offset s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; -#if (IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2) || USE_FREETYPE == 1 - std::vector<std::wstring> text_rows = str_split(ntext, L'\n'); - s32 tooltip_height = m_tooltip_element->getTextHeight() * text_rows.size() + 5; -#else s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; -#endif + v2u32 screenSize = Environment->getVideoDriver()->getScreenSize(); int tooltip_offset_x = m_btn_height; int tooltip_offset_y = m_btn_height; |