1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:17:34 +00:00

LibGfx: Make Size constexpr-capable

There is nothing in the `Size` class which cannot be `constexpr`, but
without it being `constexpr` it prevents other things from being
`constexpr`-capable.
This commit is contained in:
Lenny Maiorani 2022-02-26 17:49:06 -07:00 committed by Linus Groh
parent 219e3b9235
commit dc518404ce

View file

@ -16,71 +16,71 @@ namespace Gfx {
template<typename T>
class Size {
public:
Size() = default;
constexpr Size() = default;
Size(T w, T h)
constexpr Size(T w, T h)
: m_width(w)
, m_height(h)
{
}
template<typename U>
Size(U width, U height)
constexpr Size(U width, U height)
: m_width(width)
, m_height(height)
{
}
template<typename U>
explicit Size(Size<U> const& other)
explicit constexpr Size(Size<U> const& other)
: m_width(other.width())
, m_height(other.height())
{
}
[[nodiscard]] ALWAYS_INLINE T width() const { return m_width; }
[[nodiscard]] ALWAYS_INLINE T height() const { return m_height; }
[[nodiscard]] ALWAYS_INLINE T area() const { return width() * height(); }
[[nodiscard]] ALWAYS_INLINE constexpr T width() const { return m_width; }
[[nodiscard]] ALWAYS_INLINE constexpr T height() const { return m_height; }
[[nodiscard]] ALWAYS_INLINE constexpr T area() const { return width() * height(); }
ALWAYS_INLINE void set_width(T w) { m_width = w; }
ALWAYS_INLINE void set_height(T h) { m_height = h; }
ALWAYS_INLINE constexpr void set_width(T w) { m_width = w; }
ALWAYS_INLINE constexpr void set_height(T h) { m_height = h; }
[[nodiscard]] ALWAYS_INLINE bool is_null() const { return !m_width && !m_height; }
[[nodiscard]] ALWAYS_INLINE bool is_empty() const { return m_width <= 0 || m_height <= 0; }
[[nodiscard]] ALWAYS_INLINE constexpr bool is_null() const { return !m_width && !m_height; }
[[nodiscard]] ALWAYS_INLINE constexpr bool is_empty() const { return m_width <= 0 || m_height <= 0; }
void scale_by(T dx, T dy)
constexpr void scale_by(T dx, T dy)
{
m_width *= dx;
m_height *= dy;
}
void transform_by(AffineTransform const& transform) { *this = transform.map(*this); }
constexpr void transform_by(AffineTransform const& transform) { *this = transform.map(*this); }
ALWAYS_INLINE void scale_by(T dboth) { scale_by(dboth, dboth); }
ALWAYS_INLINE void scale_by(Point<T> const& s) { scale_by(s.x(), s.y()); }
ALWAYS_INLINE constexpr void scale_by(T dboth) { scale_by(dboth, dboth); }
ALWAYS_INLINE constexpr void scale_by(Point<T> const& s) { scale_by(s.x(), s.y()); }
[[nodiscard]] Size scaled_by(T dx, T dy) const
[[nodiscard]] constexpr Size scaled_by(T dx, T dy) const
{
Size<T> size = *this;
size.scale_by(dx, dy);
return size;
}
[[nodiscard]] Size scaled_by(T dboth) const
[[nodiscard]] constexpr Size scaled_by(T dboth) const
{
Size<T> size = *this;
size.scale_by(dboth);
return size;
}
[[nodiscard]] Size scaled_by(Point<T> const& s) const
[[nodiscard]] constexpr Size scaled_by(Point<T> const& s) const
{
Size<T> size = *this;
size.scale_by(s);
return size;
}
[[nodiscard]] Size transformed_by(AffineTransform const& transform) const
[[nodiscard]] constexpr Size transformed_by(AffineTransform const& transform) const
{
Size<T> size = *this;
size.transform_by(transform);
@ -88,24 +88,24 @@ public:
}
template<typename U>
[[nodiscard]] bool contains(Size<U> const& other) const
[[nodiscard]] constexpr bool contains(Size<U> const& other) const
{
return other.m_width <= m_width && other.m_height <= m_height;
}
template<class U>
[[nodiscard]] bool operator==(Size<U> const& other) const
[[nodiscard]] constexpr bool operator==(Size<U> const& other) const
{
return width() == other.width() && height() == other.height();
}
template<class U>
[[nodiscard]] bool operator!=(Size<U> const& other) const
[[nodiscard]] constexpr bool operator!=(Size<U> const& other) const
{
return !(*this == other);
}
Size<T>& operator-=(Size<T> const& other)
constexpr Size<T>& operator-=(Size<T> const& other)
{
m_width -= other.m_width;
m_height -= other.m_height;
@ -119,21 +119,21 @@ public:
return *this;
}
[[nodiscard]] Size<T> operator*(T factor) const { return { m_width * factor, m_height * factor }; }
[[nodiscard]] constexpr Size<T> operator*(T factor) const { return { m_width * factor, m_height * factor }; }
Size<T>& operator*=(T factor)
constexpr Size<T>& operator*=(T factor)
{
m_width *= factor;
m_height *= factor;
return *this;
}
[[nodiscard]] T primary_size_for_orientation(Orientation orientation) const
[[nodiscard]] constexpr T primary_size_for_orientation(Orientation orientation) const
{
return orientation == Orientation::Vertical ? height() : width();
}
void set_primary_size_for_orientation(Orientation orientation, T value)
constexpr void set_primary_size_for_orientation(Orientation orientation, T value)
{
if (orientation == Orientation::Vertical) {
set_height(value);
@ -142,12 +142,12 @@ public:
}
}
[[nodiscard]] T secondary_size_for_orientation(Orientation orientation) const
[[nodiscard]] constexpr T secondary_size_for_orientation(Orientation orientation) const
{
return orientation == Orientation::Vertical ? width() : height();
}
void set_secondary_size_for_orientation(Orientation orientation, T value)
constexpr void set_secondary_size_for_orientation(Orientation orientation, T value)
{
if (orientation == Orientation::Vertical) {
set_width(value);
@ -157,7 +157,7 @@ public:
}
template<typename U>
[[nodiscard]] ALWAYS_INLINE Size<U> to_type() const
[[nodiscard]] ALWAYS_INLINE constexpr Size<U> to_type() const
{
return Size<U>(*this);
}