From c17c40a0f5f4276c576400259e691f1273370193 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 13 Feb 2016 22:08:58 +0100 Subject: [PATCH] Formspec: fix broken irrlicht 1.7 build Fixes #3701. --- src/guiFormSpecMenu.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 8a657a2ff..2e9421b3e 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2434,9 +2434,14 @@ void GUIFormSpecMenu::drawMenu() // Viewport rectangle on screen core::rect rect = imgrect + spec.pos; if (spec.parent_button && spec.parent_button->isPressed()) { +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) + rect += core::dimension2d( + 0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight()); +#else rect += core::dimension2d( skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); +#endif } drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, m_gamedef, IT_ROT_NONE); @@ -2472,11 +2477,16 @@ void GUIFormSpecMenu::drawMenu() const StaticTextSpec &spec = m_static_texts[i]; core::rect rect = spec.rect; if (spec.parent_button && spec.parent_button->isPressed()) { +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) + rect += core::dimension2d( + 0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight()); +#else // Use image offset instead of text's because its a bit smaller // and fits better, also TEXT_OFFSET_X is always 0 rect += core::dimension2d( skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); +#endif } video::SColor color(255, 255, 255, 255); m_font->draw(spec.text.c_str(), rect, color, true, true, &rect); -- 2.25.1