mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 11:08:11 +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
|
@ -287,7 +287,7 @@ void LayerListWidget::mousemove_event(GUI::MouseEvent& event)
|
||||||
gadget.movement_delta.set_y(inner_rect_max_height - gadget.rect.bottom());
|
gadget.movement_delta.set_y(inner_rect_max_height - gadget.rect.bottom());
|
||||||
|
|
||||||
m_automatic_scroll_delta = automatic_scroll_delta_from_position(event.position());
|
m_automatic_scroll_delta = automatic_scroll_delta_from_position(event.position());
|
||||||
set_automatic_scrolling_timer_active(vertical_scrollbar().is_scrollable() && !m_automatic_scroll_delta.is_null());
|
set_automatic_scrolling_timer_active(vertical_scrollbar().is_scrollable() && !m_automatic_scroll_delta.is_zero());
|
||||||
|
|
||||||
relayout_gadgets();
|
relayout_gadgets();
|
||||||
}
|
}
|
||||||
|
|
|
@ -796,7 +796,7 @@ void AbstractView::drag_move_event(DragEvent& event)
|
||||||
|
|
||||||
if (acceptable) {
|
if (acceptable) {
|
||||||
m_automatic_scroll_delta = automatic_scroll_delta_from_position(event.position());
|
m_automatic_scroll_delta = automatic_scroll_delta_from_position(event.position());
|
||||||
set_automatic_scrolling_timer_active(!m_automatic_scroll_delta.is_null());
|
set_automatic_scrolling_timer_active(!m_automatic_scroll_delta.is_zero());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_drop_candidate_index != new_drop_candidate_index) {
|
if (m_drop_candidate_index != new_drop_candidate_index) {
|
||||||
|
@ -819,7 +819,7 @@ void AbstractView::drag_leave_event(Event&)
|
||||||
|
|
||||||
void AbstractView::automatic_scrolling_timer_did_fire()
|
void AbstractView::automatic_scrolling_timer_did_fire()
|
||||||
{
|
{
|
||||||
if (m_automatic_scroll_delta.is_null())
|
if (m_automatic_scroll_delta.is_zero())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
vertical_scrollbar().increase_slider_by(m_automatic_scroll_delta.y());
|
vertical_scrollbar().increase_slider_by(m_automatic_scroll_delta.y());
|
||||||
|
|
|
@ -13,7 +13,7 @@ constexpr float wheel_zoom_factor = 8.0f;
|
||||||
|
|
||||||
void AbstractZoomPanWidget::set_scale(float new_scale)
|
void AbstractZoomPanWidget::set_scale(float new_scale)
|
||||||
{
|
{
|
||||||
if (m_original_rect.is_null())
|
if (m_original_rect.is_empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_scale = clamp(new_scale, m_min_scale, m_max_scale);
|
m_scale = clamp(new_scale, m_min_scale, m_max_scale);
|
||||||
|
@ -36,7 +36,7 @@ void AbstractZoomPanWidget::scale_by(float delta)
|
||||||
|
|
||||||
void AbstractZoomPanWidget::scale_centered(float new_scale, Gfx::IntPoint center)
|
void AbstractZoomPanWidget::scale_centered(float new_scale, Gfx::IntPoint center)
|
||||||
{
|
{
|
||||||
if (m_original_rect.is_null())
|
if (m_original_rect.is_empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
new_scale = clamp(new_scale, m_min_scale, m_max_scale);
|
new_scale = clamp(new_scale, m_min_scale, m_max_scale);
|
||||||
|
@ -154,7 +154,7 @@ void AbstractZoomPanWidget::mouseup_event(GUI::MouseEvent& event)
|
||||||
|
|
||||||
void AbstractZoomPanWidget::relayout()
|
void AbstractZoomPanWidget::relayout()
|
||||||
{
|
{
|
||||||
if (m_original_rect.is_null())
|
if (m_original_rect.is_empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_content_rect.set_location({
|
m_content_rect.set_location({
|
||||||
|
|
|
@ -329,7 +329,7 @@ void IconView::mousemove_event(MouseEvent& event)
|
||||||
|
|
||||||
if (m_rubber_banding) {
|
if (m_rubber_banding) {
|
||||||
m_out_of_view_position = event.position();
|
m_out_of_view_position = event.position();
|
||||||
set_automatic_scrolling_timer_active(!m_rubber_band_scroll_delta.is_null());
|
set_automatic_scrolling_timer_active(!m_rubber_band_scroll_delta.is_zero());
|
||||||
|
|
||||||
if (update_rubber_banding(event.position()))
|
if (update_rubber_banding(event.position()))
|
||||||
return;
|
return;
|
||||||
|
@ -342,7 +342,7 @@ void IconView::automatic_scrolling_timer_did_fire()
|
||||||
{
|
{
|
||||||
AbstractView::automatic_scrolling_timer_did_fire();
|
AbstractView::automatic_scrolling_timer_did_fire();
|
||||||
|
|
||||||
if (m_rubber_band_scroll_delta.is_null())
|
if (m_rubber_band_scroll_delta.is_zero())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
vertical_scrollbar().increase_slider_by(m_rubber_band_scroll_delta.y());
|
vertical_scrollbar().increase_slider_by(m_rubber_band_scroll_delta.y());
|
||||||
|
|
|
@ -175,7 +175,7 @@ void Scrollbar::paint_event(PaintEvent& event)
|
||||||
hovered_component_for_painting = Component::None;
|
hovered_component_for_painting = Component::None;
|
||||||
|
|
||||||
painter.fill_rect_with_dither_pattern(rect(), palette().button().lightened(1.3f), palette().button());
|
painter.fill_rect_with_dither_pattern(rect(), palette().button().lightened(1.3f), palette().button());
|
||||||
if (m_gutter_click_state != GutterClickState::NotPressed && has_scrubber() && !scrubber_rect().is_null() && hovered_component_for_painting == Component::Gutter) {
|
if (m_gutter_click_state != GutterClickState::NotPressed && has_scrubber() && !scrubber_rect().is_empty() && hovered_component_for_painting == Component::Gutter) {
|
||||||
Gfx::IntRect rect_to_fill = rect();
|
Gfx::IntRect rect_to_fill = rect();
|
||||||
if (orientation() == Orientation::Vertical) {
|
if (orientation() == Orientation::Vertical) {
|
||||||
if (m_gutter_click_state == GutterClickState::BeforeScrubber) {
|
if (m_gutter_click_state == GutterClickState::BeforeScrubber) {
|
||||||
|
@ -221,7 +221,7 @@ void Scrollbar::paint_event(PaintEvent& event)
|
||||||
painter.draw_triangle(increment_location, orientation() == Orientation::Vertical ? s_down_arrow_coords : s_right_arrow_coords, (has_scrubber() && is_enabled() && !is_max()) ? palette().button_text() : palette().threed_shadow1());
|
painter.draw_triangle(increment_location, orientation() == Orientation::Vertical ? s_down_arrow_coords : s_right_arrow_coords, (has_scrubber() && is_enabled() && !is_max()) ? palette().button_text() : palette().threed_shadow1());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (has_scrubber() && !scrubber_rect().is_null())
|
if (has_scrubber() && !scrubber_rect().is_empty())
|
||||||
Gfx::StylePainter::paint_button(painter, scrubber_rect(), palette(), Gfx::ButtonStyle::ThickCap, false, hovered_component_for_painting == Component::Scrubber || m_pressed_component == Component::Scrubber);
|
Gfx::StylePainter::paint_button(painter, scrubber_rect(), palette(), Gfx::ButtonStyle::ThickCap, false, hovered_component_for_painting == Component::Scrubber || m_pressed_component == Component::Scrubber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,8 @@ public:
|
||||||
[](Detail::Boolean v) { return v.value; },
|
[](Detail::Boolean v) { return v.value; },
|
||||||
[](DeprecatedString const& v) { return !v.is_null(); },
|
[](DeprecatedString const& v) { return !v.is_null(); },
|
||||||
[](Integral auto v) { return v != 0; },
|
[](Integral auto v) { return v != 0; },
|
||||||
[](OneOf<Gfx::IntRect, Gfx::IntPoint, Gfx::IntSize> auto const& v) { return !v.is_null(); },
|
[](Gfx::IntPoint const& v) { return !v.is_zero(); },
|
||||||
|
[](OneOf<Gfx::IntRect, Gfx::IntSize> auto const& v) { return !v.is_empty(); },
|
||||||
[](Enum auto const&) { return true; },
|
[](Enum auto const&) { return true; },
|
||||||
[](OneOf<float, DeprecatedString, Color, NonnullRefPtr<Gfx::Font>, NonnullRefPtr<Gfx::Bitmap>, GUI::Icon> auto const&) { return true; });
|
[](OneOf<float, DeprecatedString, Color, NonnullRefPtr<Gfx::Font>, NonnullRefPtr<Gfx::Bitmap>, GUI::Icon> auto const&) { return true; });
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,7 @@ public:
|
||||||
ALWAYS_INLINE void set_x(T x) { m_x = x; }
|
ALWAYS_INLINE void set_x(T x) { m_x = x; }
|
||||||
ALWAYS_INLINE void set_y(T y) { m_y = y; }
|
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_zero() const { return m_x == 0 && m_y == 0; }
|
||||||
[[nodiscard]] ALWAYS_INLINE bool is_empty() const { return m_x <= 0 && m_y <= 0; }
|
|
||||||
|
|
||||||
void translate_by(T dx, T dy)
|
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 Point<T> const& location() const { return m_location; }
|
||||||
[[nodiscard]] ALWAYS_INLINE Size<T> const& size() const { return m_size; }
|
[[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; }
|
[[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); }
|
ALWAYS_INLINE void translate_by(T dx, T dy) { m_location.translate_by(dx, dy); }
|
||||||
|
@ -831,7 +830,7 @@ public:
|
||||||
deltas.clear_with_capacity();
|
deltas.clear_with_capacity();
|
||||||
for (auto& rect : rects) {
|
for (auto& rect : rects) {
|
||||||
auto delta = calc_delta(rect);
|
auto delta = calc_delta(rect);
|
||||||
if (!delta.is_null())
|
if (!delta.is_zero())
|
||||||
changes = true;
|
changes = true;
|
||||||
deltas.append(delta);
|
deltas.append(delta);
|
||||||
}
|
}
|
||||||
|
@ -868,9 +867,9 @@ public:
|
||||||
|
|
||||||
[[nodiscard]] Rect<T> united(Rect<T> const& other) const
|
[[nodiscard]] Rect<T> united(Rect<T> const& other) const
|
||||||
{
|
{
|
||||||
if (is_null())
|
if (is_empty())
|
||||||
return other;
|
return other;
|
||||||
if (other.is_null())
|
if (other.is_empty())
|
||||||
return *this;
|
return *this;
|
||||||
Rect<T> rect;
|
Rect<T> rect;
|
||||||
rect.set_left(min(left(), other.left()));
|
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_width(T w) { m_width = w; }
|
||||||
ALWAYS_INLINE constexpr void set_height(T h) { m_height = h; }
|
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; }
|
[[nodiscard]] ALWAYS_INLINE constexpr bool is_empty() const { return m_width <= 0 || m_height <= 0; }
|
||||||
|
|
||||||
constexpr void scale_by(T dx, T dy)
|
constexpr void scale_by(T dx, T dy)
|
||||||
|
|
|
@ -154,7 +154,7 @@ void ConnectionFromClient::popup_menu(i32 menu_id, Gfx::IntPoint screen_position
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
auto& menu = *(*it).value;
|
auto& menu = *(*it).value;
|
||||||
if (!button_rect.is_null())
|
if (!button_rect.is_empty())
|
||||||
menu.open_button_menu(position, button_rect);
|
menu.open_button_menu(position, button_rect);
|
||||||
else
|
else
|
||||||
menu.popup(position);
|
menu.popup(position);
|
||||||
|
@ -654,7 +654,7 @@ void ConnectionFromClient::create_window(i32 window_id, Gfx::IntRect const& rect
|
||||||
window->set_alpha_hit_threshold(alpha_hit_threshold);
|
window->set_alpha_hit_threshold(alpha_hit_threshold);
|
||||||
window->set_size_increment(size_increment);
|
window->set_size_increment(size_increment);
|
||||||
window->set_base_size(base_size);
|
window->set_base_size(base_size);
|
||||||
if (resize_aspect_ratio.has_value() && !resize_aspect_ratio.value().is_null())
|
if (resize_aspect_ratio.has_value() && !resize_aspect_ratio.value().is_empty())
|
||||||
window->set_resize_aspect_ratio(resize_aspect_ratio);
|
window->set_resize_aspect_ratio(resize_aspect_ratio);
|
||||||
window->invalidate(true, true);
|
window->invalidate(true, true);
|
||||||
if (window->type() == WindowType::Applet)
|
if (window->type() == WindowType::Applet)
|
||||||
|
|
|
@ -236,7 +236,7 @@ void WindowGeometryOverlay::update_rect()
|
||||||
{
|
{
|
||||||
if (auto* window = m_window.ptr()) {
|
if (auto* window = m_window.ptr()) {
|
||||||
auto& wm = WindowManager::the();
|
auto& wm = WindowManager::the();
|
||||||
if (!window->size_increment().is_null()) {
|
if (!window->size_increment().is_empty()) {
|
||||||
int width_steps = (window->width() - window->base_size().width()) / window->size_increment().width();
|
int width_steps = (window->width() - window->base_size().width()) / window->size_increment().width();
|
||||||
int height_steps = (window->height() - window->base_size().height()) / window->size_increment().height();
|
int height_steps = (window->height() - window->base_size().height()) / window->size_increment().height();
|
||||||
m_label = DeprecatedString::formatted("{} ({}x{})", window->rect(), width_steps, height_steps);
|
m_label = DeprecatedString::formatted("{} ({}x{})", window->rect(), width_steps, height_steps);
|
||||||
|
|
|
@ -943,7 +943,7 @@ bool WindowManager::process_ongoing_window_resize(MouseEvent const& event)
|
||||||
|
|
||||||
m_resize_window->apply_minimum_size(new_rect);
|
m_resize_window->apply_minimum_size(new_rect);
|
||||||
|
|
||||||
if (!m_resize_window->size_increment().is_null()) {
|
if (!m_resize_window->size_increment().is_empty()) {
|
||||||
int horizontal_incs = (new_rect.width() - m_resize_window->base_size().width()) / m_resize_window->size_increment().width();
|
int horizontal_incs = (new_rect.width() - m_resize_window->base_size().width()) / m_resize_window->size_increment().width();
|
||||||
new_rect.set_width(m_resize_window->base_size().width() + horizontal_incs * m_resize_window->size_increment().width());
|
new_rect.set_width(m_resize_window->base_size().width() + horizontal_incs * m_resize_window->size_increment().width());
|
||||||
int vertical_incs = (new_rect.height() - m_resize_window->base_size().height()) / m_resize_window->size_increment().height();
|
int vertical_incs = (new_rect.height() - m_resize_window->base_size().height()) / m_resize_window->size_increment().height();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue