cpp/openttd-patchpack/source Changeset - r26557:5f34421eef89

Changeset - r26557:5f34421eef89

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Peter Nelson - 2 years ago 2022-09-28 17:48:48
peter1138@openttd.org

Add: RectPadding type.

This is similar to Rect but specifies padding to apply to a Rect.

2 files changed with 55 insertions and 0 deletions:

src/core/geometry_func.cpp

src/core/geometry_type.hpp

0 comments (0 inline, 0 general)

src/core/geometry_func.cpp

➞

Show inline comments

@@ @@ -48,3 +48,5 @@ Rect BoundingRect(const Rect &r1, const @@
 	return r;
+}
 const RectPadding RectPadding::zero = {0, 0, 0, 0};

src/core/geometry_type.hpp

➞

Show inline comments

@@ @@ -43,6 +43,28 @@ struct Dimension { @@
+	}
 };
 /** Padding dimensions to apply to each side of a Rect. */
 struct RectPadding {
 	uint8 left;
 	uint8 top;
 	uint8 right;
 	uint8 bottom;
 	static const RectPadding zero;
 	/**
 	 * Get total horizontal padding of RectPadding.
 	 * @return total horizontal padding.
 	 */
 	inline uint Horizontal() const { return this->left + this->right; }
 	/**
 	 * Get total vertical padding of RectPadding.
 	 * @return total vertical padding.
 	 */
 	inline uint Vertical() const { return this->top + this->bottom; }
 };
 /** Specification of a rectangle with absolute coordinates of all edges */
 struct Rect {
 	int left;
@@ @@ -97,6 +119,27 @@ struct Rect { @@
+	}
 	/**
 	 * Copy and shrink Rect by a RectPadding.
 	 * @param other RectPadding to remove from each side of Rect.
 	 * @return the new smaller Rect.
 	 */
 	[[nodiscard]] inline Rect Shrink(const RectPadding &other) const
+	{
 		return {this->left + other.left, this->top + other.top, this->right - other.right, this->bottom - other.bottom};
+	}
 	/**
 	 * Copy and shrink Rect by a different horizontal and vertical RectPadding.
 	 * @param horz RectPadding to remove from left and right of Rect.
 	 * @param vert RectPadding to remove from top and bottom of Rect.
 	 * @return the new smaller Rect.
 	 */
 	[[nodiscard]] inline Rect Shrink(const RectPadding &horz, const RectPadding &vert) const
+	{
 		return {this->left + horz.left, this->top + vert.top, this->right - horz.right, this->bottom - vert.bottom};
+	}
 	/**
 	 * Copy and expand Rect by s pixels.
 	 * @param s number of pixels to add to each side of Rect.
 	 * @return the new larger Rect.
@@ @@ -107,6 +150,16 @@ struct Rect { @@
+	}
 	/**
 	 * Copy and expand Rect by a RectPadding.
 	 * @param other RectPadding to add to each side of Rect.
 	 * @return the new larger Rect.
 	 */
 	[[nodiscard]] inline Rect Expand(const RectPadding &other) const
+	{
 		return {this->left - other.left, this->top - other.top, this->right + other.right, this->bottom + other.bottom};
+	}
 	/**
 	 * Copy and translate Rect by x,y pixels.
 	 * @param x number of pixels to move horizontally.
 	 * @param y number of pixels to move vertically.

0 comments (0 inline, 0 general)