mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 07:37:35 +00:00
LibGfx+Overall: Remove is_null
from Point
, Rect
and Size
Having a `Point`, `Rect` or `Size` claim it's `null` is silly. We have `Optional<T>` for that. For `Point`, rename `is_null` to `is_zero` to better reflect what we're testing. For `Rect` and `Size`, `is_null` is removed outright. Also, remove `is_empty` from `Point`. Points can't be empty.
This commit is contained in:
parent
d5630bd20e
commit
7b0adee487
12 changed files with 20 additions and 22 deletions
|
@ -48,8 +48,7 @@ public:
|
|||
ALWAYS_INLINE void set_x(T x) { m_x = x; }
|
||||
ALWAYS_INLINE void set_y(T y) { m_y = y; }
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE bool is_null() const { return !m_x && !m_y; }
|
||||
[[nodiscard]] ALWAYS_INLINE bool is_empty() const { return m_x <= 0 && m_y <= 0; }
|
||||
[[nodiscard]] ALWAYS_INLINE bool is_zero() const { return m_x == 0 && m_y == 0; }
|
||||
|
||||
void translate_by(T dx, T dy)
|
||||
{
|
||||
|
|
|
@ -76,7 +76,6 @@ public:
|
|||
[[nodiscard]] ALWAYS_INLINE Point<T> const& location() const { return m_location; }
|
||||
[[nodiscard]] ALWAYS_INLINE Size<T> const& size() const { return m_size; }
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE bool is_null() const { return width() == 0 && height() == 0; }
|
||||
[[nodiscard]] ALWAYS_INLINE bool is_empty() const { return width() <= 0 || height() <= 0; }
|
||||
|
||||
ALWAYS_INLINE void translate_by(T dx, T dy) { m_location.translate_by(dx, dy); }
|
||||
|
@ -831,7 +830,7 @@ public:
|
|||
deltas.clear_with_capacity();
|
||||
for (auto& rect : rects) {
|
||||
auto delta = calc_delta(rect);
|
||||
if (!delta.is_null())
|
||||
if (!delta.is_zero())
|
||||
changes = true;
|
||||
deltas.append(delta);
|
||||
}
|
||||
|
@ -868,9 +867,9 @@ public:
|
|||
|
||||
[[nodiscard]] Rect<T> united(Rect<T> const& other) const
|
||||
{
|
||||
if (is_null())
|
||||
if (is_empty())
|
||||
return other;
|
||||
if (other.is_null())
|
||||
if (other.is_empty())
|
||||
return *this;
|
||||
Rect<T> rect;
|
||||
rect.set_left(min(left(), other.left()));
|
||||
|
|
|
@ -45,7 +45,6 @@ public:
|
|||
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 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; }
|
||||
|
||||
constexpr void scale_by(T dx, T dy)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue