1 files changed, 113 insertions, 6 deletions

diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
index 999c1d237..3e842e826 100644
--- a/src/gui/StyleSpec.h
+++ b/src/gui/StyleSpec.h
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "client/tile.h" // ITextureSource
+#include "debug.h"
 #include "irrlichttypes_extrabloated.h"
 #include "util/string.h"
 #include <array>
@@ -31,25 +32,36 @@ public:
 	{
 		TEXTCOLOR,
 		BGCOLOR,
-		BGCOLOR_HOVERED,
-		BGCOLOR_PRESSED,
+		BGCOLOR_HOVERED, // Note: Deprecated property
+		BGCOLOR_PRESSED, // Note: Deprecated property
 		NOCLIP,
 		BORDER,
 		BGIMG,
-		BGIMG_HOVERED,
+		BGIMG_HOVERED, // Note: Deprecated property
 		BGIMG_MIDDLE,
-		BGIMG_PRESSED,
+		BGIMG_PRESSED, // Note: Deprecated property
 		FGIMG,
-		FGIMG_HOVERED,
-		FGIMG_PRESSED,
+		FGIMG_HOVERED, // Note: Deprecated property
+		FGIMG_PRESSED, // Note: Deprecated property
 		ALPHA,
+		CONTENT_OFFSET,
+		PADDING,
 		NUM_PROPERTIES,
 		NONE
 	};
+	enum State
+	{
+		STATE_DEFAULT = 0,
+		STATE_HOVERED = 1 << 0,
+		STATE_PRESSED = 1 << 1,
+		NUM_STATES = 1 << 2,
+		STATE_INVALID = 1 << 3,
+	};
 
 private:
 	std::array<bool, NUM_PROPERTIES> property_set{};
 	std::array<std::string, NUM_PROPERTIES> properties;
+	State state_map = STATE_DEFAULT;
 
 public:
 	static Property GetPropertyByName(const std::string &name)
@@ -82,6 +94,10 @@ public:
 			return FGIMG_PRESSED;
 		} else if (name == "alpha") {
 			return ALPHA;
+		} else if (name == "content_offset") {
+			return CONTENT_OFFSET;
+		} else if (name == "padding") {
+			return PADDING;
 		} else {
 			return NONE;
 		}
@@ -99,6 +115,49 @@ public:
 		property_set[prop] = true;
 	}
 
+	//! Parses a name and returns the corresponding state enum
+	static State getStateByName(const std::string &name)
+	{
+		if (name == "default") {
+			return STATE_DEFAULT;
+		} else if (name == "hovered") {
+			return STATE_HOVERED;
+		} else if (name == "pressed") {
+			return STATE_PRESSED;
+		} else {
+			return STATE_INVALID;
+		}
+	}
+
+	//! Gets the state that this style is intended for
+	State getState() const
+	{
+		return state_map;
+	}
+
+	//! Set the given state on this style
+	void addState(State state)
+	{
+		FATAL_ERROR_IF(state >= NUM_STATES, "Out-of-bounds state received");
+
+		state_map = static_cast<State>(state_map | state);
+	}
+
+	//! Using a list of styles mapped to state values, calculate the final
+	//  combined style for a state by propagating values in its component states
+	static StyleSpec getStyleFromStatePropagation(const std::array<StyleSpec, NUM_STATES> &styles, State state)
+	{
+		StyleSpec temp = styles[StyleSpec::STATE_DEFAULT];
+		temp.state_map = state;
+		for (int i = StyleSpec::STATE_DEFAULT + 1; i <= state; i++) {
+			if ((state & i) != 0) {
+				temp = temp | styles[i];
+			}
+		}
+
+		return temp;
+	}
+
 	video::SColor getColor(Property prop, video::SColor def) const
 	{
 		const auto &val = properties[prop];
@@ -143,6 +202,29 @@ public:
 		return rect;
 	}
 
+	irr::core::vector2d<s32> getVector2i(Property prop, irr::core::vector2d<s32> def) const
+	{
+		const auto &val = properties[prop];
+		if (val.empty())
+			return def;
+
+		irr::core::vector2d<s32> vec;
+		if (!parseVector2i(val, &vec))
+			return def;
+
+		return vec;
+	}
+
+	irr::core::vector2d<s32> getVector2i(Property prop) const
+	{
+		const auto &val = properties[prop];
+		FATAL_ERROR_IF(val.empty(), "Unexpected missing property");
+
+		irr::core::vector2d<s32> vec;
+		parseVector2i(val, &vec);
+		return vec;
+	}
+
 	video::ITexture *getTexture(Property prop, ISimpleTextureSource *tsrc,
 			video::ITexture *def) const
 	{
@@ -233,4 +315,29 @@ private:
 
 		return true;
 	}
+
+	bool parseVector2i(const std::string &value, irr::core::vector2d<s32> *parsed_vec) const
+	{
+		irr::core::vector2d<s32> vec;
+		std::vector<std::string> v_vector = split(value, ',');
+
+		if (v_vector.size() == 1) {
+			s32 x = stoi(v_vector[0]);
+			vec.X = x;
+			vec.Y = x;
+		} else if (v_vector.size() == 2) {
+			s32 x = stoi(v_vector[0]);
+			s32 y =	stoi(v_vector[1]);
+			vec.X = x;
+			vec.Y = y;
+		} else {
+			warningstream << "Invalid vector2d string format: \"" << value
+					<< "\"" << std::endl;
+			return false;
+		}
+
+		*parsed_vec = vec;
+
+		return true;
+	}
 };