From ee6c499ff8b9abf0d22ebc817a26f33322ffdd5b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Wed, 24 Jun 2020 11:35:06 +0200 Subject: [PATCH] Fix wrong use of guiScalingImageButton in formspecs buttons (#10094) --- src/gui/guiButton.cpp | 5 ++--- src/gui/guiButtonImage.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp index ff35958fd..6732a9233 100644 --- a/src/gui/guiButton.cpp +++ b/src/gui/guiButton.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 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); diff --git a/src/gui/guiButtonImage.cpp b/src/gui/guiButtonImage.cpp index 2658ad967..b507ffece 100644 --- a/src/gui/guiButtonImage.cpp +++ b/src/gui/guiButtonImage.cpp @@ -62,13 +62,12 @@ void GUIButtonImage::setFromStyle(const StyleSpec& style) video::IVideoDriver *driver = Environment->getVideoDriver(); - const core::position2di buttonCenter(AbsoluteRect.getCenter()); - core::position2d 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); -- 2.25.1