From 60544ac56f13132ef24ce38024627a127f7f15f0 Mon Sep 17 00:00:00 2001 From: Hugues Ross Date: Sun, 26 Jan 2020 14:35:26 -0500 Subject: Add 9-slice background support to button formspec elements (#9290) --- src/gui/StyleSpec.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/gui/guiButton.cpp | 24 +++++++++++++++++---- src/gui/guiButton.h | 2 ++ 3 files changed, 80 insertions(+), 4 deletions(-) (limited to 'src/gui') diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h index 5c9e20a11..999c1d237 100644 --- a/src/gui/StyleSpec.h +++ b/src/gui/StyleSpec.h @@ -37,6 +37,7 @@ public: BORDER, BGIMG, BGIMG_HOVERED, + BGIMG_MIDDLE, BGIMG_PRESSED, FGIMG, FGIMG_HOVERED, @@ -69,6 +70,8 @@ public: return BGIMG; } else if (name == "bgimg_hovered") { return BGIMG_HOVERED; + } else if (name == "bgimg_middle") { + return BGIMG_MIDDLE; } else if (name == "bgimg_pressed") { return BGIMG_PRESSED; } else if (name == "fgimg") { @@ -117,6 +120,29 @@ public: return color; } + irr::core::rect getRect(Property prop, irr::core::rect def) const + { + const auto &val = properties[prop]; + if (val.empty()) + return def; + + irr::core::rect rect; + if (!parseRect(val, &rect)) + return def; + + return rect; + } + + irr::core::rect getRect(Property prop) const + { + const auto &val = properties[prop]; + FATAL_ERROR_IF(val.empty(), "Unexpected missing property"); + + irr::core::rect rect; + parseRect(val, &rect); + return rect; + } + video::ITexture *getTexture(Property prop, ISimpleTextureSource *tsrc, video::ITexture *def) const { @@ -175,4 +201,36 @@ public: newspec |= other; return newspec; } + +private: + bool parseRect(const std::string &value, irr::core::rect *parsed_rect) const + { + irr::core::rect rect; + std::vector v_rect = split(value, ','); + + if (v_rect.size() == 1) { + s32 x = stoi(v_rect[0]); + rect.UpperLeftCorner = irr::core::vector2di(x, x); + rect.LowerRightCorner = irr::core::vector2di(-x, -x); + } else if (v_rect.size() == 2) { + s32 x = stoi(v_rect[0]); + s32 y = stoi(v_rect[1]); + rect.UpperLeftCorner = irr::core::vector2di(x, y); + rect.LowerRightCorner = irr::core::vector2di(-x, -y); + // `-x` is interpreted as `w - x` + } else if (v_rect.size() == 4) { + rect.UpperLeftCorner = irr::core::vector2di( + stoi(v_rect[0]), stoi(v_rect[1])); + rect.LowerRightCorner = irr::core::vector2di( + stoi(v_rect[2]), stoi(v_rect[3])); + } else { + warningstream << "Invalid rectangle string format: \"" << value + << "\"" << std::endl; + return false; + } + + *parsed_rect = rect; + + return true; + } }; diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp index f7a0af2d9..4c16ee237 100644 --- a/src/gui/guiButton.cpp +++ b/src/gui/guiButton.cpp @@ -307,10 +307,25 @@ void GUIButton::draw() } } - driver->draw2DImage(ButtonImages[(u32)imageState].Texture, - ScaleImage? AbsoluteRect : core::rect(pos, sourceRect.getSize()), - sourceRect, &AbsoluteClippingRect, - 0, UseAlphaChannel); + // PATCH + video::ITexture* texture = ButtonImages[(u32)imageState].Texture; + if (BgMiddle.getArea() == 0) { + driver->draw2DImage(texture, + ScaleImage? AbsoluteRect : core::rect(pos, sourceRect.getSize()), + sourceRect, &AbsoluteClippingRect, + 0, UseAlphaChannel); + } else { + core::rect middle = BgMiddle; + // `-x` is interpreted as `w - x` + if (middle.LowerRightCorner.X < 0) + middle.LowerRightCorner.X += texture->getOriginalSize().Width; + if (middle.LowerRightCorner.Y < 0) + middle.LowerRightCorner.Y += texture->getOriginalSize().Height; + draw2DImage9Slice(driver, texture, + ScaleImage ? AbsoluteRect : core::rect(pos, sourceRect.getSize()), + middle, &AbsoluteClippingRect); + } + // END PATCH } if (SpriteBank) @@ -804,5 +819,6 @@ void GUIButton::setFromStyle(const StyleSpec& style, ISimpleTextureSource *tsrc) Environment->getVideoDriver(), pressed_texture, geom.X, geom.Y)); setScaleImage(true); } + BgMiddle = style.getRect(StyleSpec::BGIMG_MIDDLE, BgMiddle); } // END PATCH diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h index 37b278d25..3d1f98c32 100644 --- a/src/gui/guiButton.h +++ b/src/gui/guiButton.h @@ -330,5 +330,7 @@ private: video::SColor PressedColors[4]; gui::IGUIStaticText *StaticText; + + core::rect BgMiddle; // END PATCH }; -- cgit v1.2.3