From cb9a44ef8998ff66c00187efc508bf8bd6cc2d67 Mon Sep 17 00:00:00 2001
From: Hugues Ross <hugues.ross@gmail.com>
Date: Sat, 2 May 2020 07:32:02 -0400
Subject: Add 'content_offset' and 'padding' style properties for buttons
 (#9661)

* Add padding and content_offset style properties to buttons
---
 src/gui/guiButton.cpp | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'src/gui/guiButton.cpp')

diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp
index 9dfe36bc4..ff35958fd 100644
--- a/src/gui/guiButton.cpp
+++ b/src/gui/guiButton.cpp
@@ -592,25 +592,6 @@ void GUIButton::setPressed(bool pressed)
 	{
 		ClickTime = porting::getTimeMs();
 		Pressed = pressed;
-
-		GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
-
-		for(IGUIElement *child : getChildren())
-		{
-			core::rect<s32> originalRect = child->getRelativePosition();
-			if (Pressed) {
-				child->setRelativePosition(originalRect +
-						core::dimension2d<s32>(
-							skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
-							skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)));
-			} else {
-				child->setRelativePosition(originalRect -
-						core::dimension2d<s32>(
-							skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
-							skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)));
-			}
-		}
-
 		setFromState();
 	}
 }
@@ -819,7 +800,32 @@ void GUIButton::setFromStyle(const StyleSpec& style)
 	} else {
 		setImage(nullptr);
 	}
+
 	BgMiddle = style.getRect(StyleSpec::BGIMG_MIDDLE, BgMiddle);
+
+	// Child padding and offset
+	Padding = style.getRect(StyleSpec::PADDING, core::rect<s32>());
+	Padding = core::rect<s32>(
+			Padding.UpperLeftCorner + BgMiddle.UpperLeftCorner,
+			Padding.LowerRightCorner + BgMiddle.LowerRightCorner);
+
+	GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
+	core::vector2d<s32> defaultPressOffset(
+			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
+			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y));
+	ContentOffset = style.getVector2i(StyleSpec::CONTENT_OFFSET, isPressed()
+			? defaultPressOffset
+			: core::vector2d<s32>(0));
+
+	core::rect<s32> childBounds(
+				Padding.UpperLeftCorner.X + ContentOffset.X,
+				Padding.UpperLeftCorner.Y + ContentOffset.Y,
+				AbsoluteRect.getWidth() + Padding.LowerRightCorner.X + ContentOffset.X,
+				AbsoluteRect.getHeight() + Padding.LowerRightCorner.Y + ContentOffset.Y);
+
+	for (IGUIElement *child : getChildren()) {
+		child->setRelativePosition(childBounds);
+	}
 }
 
 //! Set the styles used for each state
-- 
cgit v1.2.3