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

NotificationServer: Use Optional for last rect in NotificationWindow

Browse source 
We were calling `Gfx::Rect<T>::is_null` which checked if the width and
height were 0. What we want to do instead, is check if the rect value
was set at all. `Optional<Rect>` is the right way to do this.
This commit is contained in:
Jelle Raaijmakers 2022-12-28 22:47:46 +01:00 • committed by Tim Flynn
parent d83f1eaeb2
commit d5630bd20e
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Services/NotificationServer/NotificationWindow.cpp
View file

@ -6,6 +6,7 @@
#include "NotificationWindow.h" #include "NotificationWindow.h"
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/Optional.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Desktop.h> #include <LibGUI/Desktop.h>
@ -21,14 +22,14 @@ static HashMap<u32, RefPtr<NotificationWindow>> s_windows;
static void update_notification_window_locations(Gfx::IntRect const& screen_rect) static void update_notification_window_locations(Gfx::IntRect const& screen_rect)
{ {
Gfx::IntRect last_window_rect; Optional<Gfx::IntRect> last_window_rect;
for (auto& window_entry : s_windows) { for (auto& window_entry : s_windows) {
auto& window = window_entry.value; auto& window = window_entry.value;
Gfx::IntPoint new_window_location; Gfx::IntPoint new_window_location;
if (last_window_rect.is_null()) if (last_window_rect.has_value())
new_window_location = screen_rect.top_right().translated(-window->rect().width() - 24, 7); new_window_location = last_window_rect.value().bottom_left().translated(0, 10);
else else
new_window_location = last_window_rect.bottom_left().translated(0, 10); new_window_location = screen_rect.top_right().translated(-window->rect().width() - 24, 7);
if (window->rect().location() != new_window_location) { if (window->rect().location() != new_window_location) {
window->move_to(new_window_location); window->move_to(new_window_location);
window->set_original_rect(window->rect()); window->set_original_rect(window->rect());
@ -46,10 +47,11 @@ NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& te
set_resizable(false); set_resizable(false);
set_minimizable(false); set_minimizable(false);
Gfx::IntRect lowest_notification_rect_on_screen; Optional<Gfx::IntRect> lowest_notification_rect_on_screen;
for (auto& window_entry : s_windows) { for (auto& window_entry : s_windows) {
auto& window = window_entry.value; auto& window = window_entry.value;
if (window->m_original_rect.y() > lowest_notification_rect_on_screen.y()) if (!lowest_notification_rect_on_screen.has_value()
|| (window->m_original_rect.y() > lowest_notification_rect_on_screen.value().y()))
lowest_notification_rect_on_screen = window->m_original_rect; lowest_notification_rect_on_screen = window->m_original_rect;
} }
@ -58,8 +60,8 @@ NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& te
rect.set_height(40); rect.set_height(40);
rect.set_location(GUI::Desktop::the().rect().top_right().translated(-rect.width() - 24, 7)); rect.set_location(GUI::Desktop::the().rect().top_right().translated(-rect.width() - 24, 7));
if (!lowest_notification_rect_on_screen.is_null()) if (lowest_notification_rect_on_screen.has_value())
rect.set_location(lowest_notification_rect_on_screen.bottom_left().translated(0, 10)); rect.set_location(lowest_notification_rect_on_screen.value().bottom_left().translated(0, 10));
set_rect(rect); set_rect(rect);