From 88acda02567d586820867059718cac551dc7a58b Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Fri, 20 May 2016 21:18:59 +1000 Subject: Fix tooltip height for versions of irrlicht < 1.8.2 Version 1.8.2 of irrlicht changed the way that IGUIStaticText::getTextHeight() works and since that release properly deals with newlines. From irrlicht changes.txt for 1.8.2, "IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set." --- src/guiFormSpecMenu.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 2bf06c1d6..b0215a84a 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2265,7 +2265,11 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, this->bringToFront(m_tooltip_element); m_tooltip_element->setText(tooltip_text.c_str()); s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; +#if IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8 && IRRLICHT_VERSION_REVISION >= 2 s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; +#else + s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5; +#endif v2u32 screenSize = driver->getScreenSize(); int tooltip_offset_x = m_btn_height; int tooltip_offset_y = m_btn_height; -- cgit v1.2.3