summaryrefslogtreecommitdiff
path: root/src/guiFormSpecMenu.cpp
diff options
context:
space:
mode:
authorlisacvuk <lisacvukhome@gmail.com>2016-11-11 12:16:34 +0100
committerZeno- <kde.psych@gmail.com>2016-11-11 21:16:34 +1000
commit8a1a9fdc24d29419422f0fb41095fd0388c4be9e (patch)
tree00f54feccd6f561681657b671e724fb7f0e0b500 /src/guiFormSpecMenu.cpp
parentb98f98b367f2c55d5a0bff4bafaaa183b3746403 (diff)
downloadminetest-8a1a9fdc24d29419422f0fb41095fd0388c4be9e.tar.gz
minetest-8a1a9fdc24d29419422f0fb41095fd0388c4be9e.tar.bz2
minetest-8a1a9fdc24d29419422f0fb41095fd0388c4be9e.zip
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.
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
-rw-r--r--src/guiFormSpecMenu.cpp2
1 files changed, 1 insertions, 1 deletions
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;