Skip to content
Permalink
Browse files

Fix wrong use of guiScalingImageButton in formspecs buttons (#10094)

  • Loading branch information
pyrollo committed Jun 24, 2020
1 parent 646af2e commit ee6c499ff8b9abf0d22ebc817a26f33322ffdd5b
Showing with 4 additions and 6 deletions.
  1. +2 −3 src/gui/guiButton.cpp
  2. +2 −3 src/gui/guiButtonImage.cpp
@@ -789,13 +789,12 @@ void GUIButton::setFromStyle(const StyleSpec& style)
setDrawBorder(style.getBool(StyleSpec::BORDER, true));
setUseAlphaChannel(style.getBool(StyleSpec::ALPHA, true));

const core::position2di buttonCenter(AbsoluteRect.getCenter());
core::position2d<s32> geom(buttonCenter);
if (style.isNotDefault(StyleSpec::BGIMG)) {
video::ITexture *texture = style.getTexture(StyleSpec::BGIMG,
getTextureSource());
setImage(guiScalingImageButton(
Environment->getVideoDriver(), texture, geom.X, geom.Y));
Environment->getVideoDriver(), texture,
AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
setScaleImage(true);
} else {
setImage(nullptr);
@@ -62,13 +62,12 @@ void GUIButtonImage::setFromStyle(const StyleSpec& style)

video::IVideoDriver *driver = Environment->getVideoDriver();

const core::position2di buttonCenter(AbsoluteRect.getCenter());
core::position2d<s32> geom(buttonCenter);
if (style.isNotDefault(StyleSpec::FGIMG)) {
video::ITexture *texture = style.getTexture(StyleSpec::FGIMG,
getTextureSource());

setForegroundImage(guiScalingImageButton(driver, texture, geom.X, geom.Y));
setForegroundImage(guiScalingImageButton(driver, texture,
AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
setScaleImage(true);
} else {
setForegroundImage(nullptr);

0 comments on commit ee6c499

Please sign in to comment.
You can’t perform that action at this time.