Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-24 15:12:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't override the FGIMG style property if the image parameter is null

Browse Source
This commit is contained in:
Hugues Ross 2019-12-14 18:09:27 -05:00 committed by sfan5
parent e42faae8d9
commit b50dc43f67
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/guiFormSpecMenu.cpp
View File

@ -1835,9 +1835,6 @@ void GUIFormSpecMenu::parseImageButton(parserData* data, const std::string &elem
if (type == "image_button_exit") if (type == "image_button_exit")
spec.is_exit = true; spec.is_exit = true;
video::ITexture *texture = 0;
texture = m_tsrc->getTexture(image_name);
GUIButtonImage *e = GUIButtonImage::addButton(Environment, rect, this, spec.fid, spec.flabel.c_str()); GUIButtonImage *e = GUIButtonImage::addButton(Environment, rect, this, spec.fid, spec.flabel.c_str());
if (spec.fname == data->focused_fieldname) { if (spec.fname == data->focused_fieldname) {
@ -1849,8 +1846,12 @@ void GUIFormSpecMenu::parseImageButton(parserData* data, const std::string &elem
// We explicitly handle these arguments *after* the style properties in // We explicitly handle these arguments *after* the style properties in
// order to override them if they are provided // order to override them if they are provided
e->setForegroundImage(guiScalingImageButton( if (!image_name.empty())
Environment->getVideoDriver(), texture, geom.X, geom.Y)); {
video::ITexture *texture = m_tsrc->getTexture(image_name);
e->setForegroundImage(guiScalingImageButton(
Environment->getVideoDriver(), texture, geom.X, geom.Y));
}
if (!pressed_image_name.empty()) { if (!pressed_image_name.empty()) {
video::ITexture *pressed_texture = m_tsrc->getTexture(pressed_image_name); video::ITexture *pressed_texture = m_tsrc->getTexture(pressed_image_name);
e->setPressedForegroundImage(guiScalingImageButton( e->setPressedForegroundImage(guiScalingImageButton(