Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix wrong use of guiScalingImageButton in formspecs buttons (#10094)
- Loading branch information
Showing
with
4 additions
and
6 deletions.
-
+2
−3
src/gui/guiButton.cpp
-
+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); |
|
|