From 8a1a9fdc24d29419422f0fb41095fd0388c4be9e Mon Sep 17 00:00:00 2001 From: lisacvuk Date: Fri, 11 Nov 2016 12:16:34 +0100 Subject: Fixed tooltips not resizing with \n (#4766) * 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/guiFormSpecMenu.cpp') diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 73388114b..981a8edba 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -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; -- cgit v1.2.3