Fixed tooltips not resizing with \n (#4766)
authorlisacvuk <lisacvukhome@gmail.com>
Fri, 11 Nov 2016 11:16:34 +0000 (12:16 +0100)
committerZeno- <kde.psych@gmail.com>
Fri, 11 Nov 2016 11:16:34 +0000 (21:16 +1000)
* Fixed tooltips not resizing with \n

* Fixed it for 1.8.4 too.

* Fixed not working with Freetype disabled.

* Modified it to use Zeno-'s solution.

src/guiFormSpecMenu.cpp

index 73388114bd470365e4183da4ac5e1ba8201eea48..981a8edbaa1a219ae3f96f0b7b3b9567c902a67e 100644 (file)
@@ -2314,7 +2314,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
                                this->bringToFront(m_tooltip_element);
                                setStaticText(m_tooltip_element, 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
+#if (IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2) || USE_FREETYPE == 1
                                s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
 #else
                                s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;