numberZero
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formspec: fix broken irrlicht 1.7 build 

Fixes #3701.
experimental
RealBadAngel 2016-02-13 22:08:58 +01:00 committed by est31
parent 5ca48a35a6
commit c17c40a0f5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/guiFormSpecMenu.cpp
View File

@ -2434,9 +2434,14 @@ void GUIFormSpecMenu::drawMenu()
// Viewport rectangle on screen // Viewport rectangle on screen
core::rect<s32> rect = imgrect + spec.pos; core::rect<s32> rect = imgrect + spec.pos;
if (spec.parent_button && spec.parent_button->isPressed()) { if (spec.parent_button && spec.parent_button->isPressed()) {
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
rect += core::dimension2d<s32>(
0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight());
#else
rect += core::dimension2d<s32>( rect += core::dimension2d<s32>(
skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y));
#endif
} }
drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect,
m_gamedef, IT_ROT_NONE); m_gamedef, IT_ROT_NONE);
@ -2472,11 +2477,16 @@ void GUIFormSpecMenu::drawMenu()
const StaticTextSpec &spec = m_static_texts[i]; const StaticTextSpec &spec = m_static_texts[i];
core::rect<s32> rect = spec.rect; core::rect<s32> rect = spec.rect;
if (spec.parent_button && spec.parent_button->isPressed()) { if (spec.parent_button && spec.parent_button->isPressed()) {
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
rect += core::dimension2d<s32>(
0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight());
#else
// Use image offset instead of text's because its a bit smaller // Use image offset instead of text's because its a bit smaller
// and fits better, also TEXT_OFFSET_X is always 0 // and fits better, also TEXT_OFFSET_X is always 0
rect += core::dimension2d<s32>( rect += core::dimension2d<s32>(
skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y));
#endif
} }
video::SColor color(255, 255, 255, 255); video::SColor color(255, 255, 255, 255);
m_font->draw(spec.text.c_str(), rect, color, true, true, &rect); m_font->draw(spec.text.c_str(), rect, color, true, true, &rect);