1 files changed, 58 insertions, 0 deletions
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<s32> getRect(Property prop, irr::core::rect<s32> def) const
+	{
+		const auto &val = properties[prop];
+		if (val.empty())
+			return def;
+
+		irr::core::rect<s32> rect;
+		if (!parseRect(val, &rect))
+			return def;
+
+		return rect;
+	}
+
+	irr::core::rect<s32> getRect(Property prop) const
+	{
+		const auto &val = properties[prop];
+		FATAL_ERROR_IF(val.empty(), "Unexpected missing property");
+
+		irr::core::rect<s32> 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<s32> *parsed_rect) const
+	{
+		irr::core::rect<s32> rect;
+		std::vector<std::string> 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;
+	}
 };