RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 17:07:46 +00:00
Code Issues Activity Actions

LibGfx+Overall: Remove is_null from Point, Rect and Size

Browse source 
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:
Jelle Raaijmakers 2022-12-28 22:43:30 +01:00 • committed by Tim Flynn
parent d5630bd20e
commit 7b0adee487
12 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Services/WindowServer/ConnectionFromClient.cpp
View file

@ -154,7 +154,7 @@ void ConnectionFromClient::popup_menu(i32 menu_id, Gfx::IntPoint screen_position
return;
}
auto& menu = *(*it).value;
if (!button_rect.is_null())
if (!button_rect.is_empty())
menu.open_button_menu(position, button_rect);
else
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_size_increment(size_increment);
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->invalidate(true, true);
if (window->type() == WindowType::Applet)

2
Userland/Services/WindowServer/Overlays.cpp
View file

@ -236,7 +236,7 @@ void WindowGeometryOverlay::update_rect()
{
if (auto* window = m_window.ptr()) {
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 height_steps = (window->height() - window->base_size().height()) / window->size_increment().height();
m_label = DeprecatedString::formatted("{} ({}x{})", window->rect(), width_steps, height_steps);

2
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -943,7 +943,7 @@ bool WindowManager::process_ongoing_window_resize(MouseEvent const& event)
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();
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();