RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 21:57:34 +00:00
Code Issues Activity Actions

WindowServer+NotificationServer: Vertical title bar for notifications

Browse source 
This patch adds a specialized window type for notifications. They now
have a title bar on the right-hand side, with a close button.

This removes the need for the "Done" button in notifications, giving us
a bit more horizontal space overall.

Design based on a mock-up from @xTibor :^)
This commit is contained in:
Andreas Kling 2020-03-30 17:00:23 +02:00
parent cbd7effd3b
commit 012a4eb0b5
7 changed files with 115 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Servers/NotificationServer/NotificationWindow.cpp
View file

@ -45,9 +45,9 @@ void update_notification_window_locations()
for (auto& window : s_windows) {
Gfx::Point new_window_location;
if (last_window_rect.is_null())
new_window_location = GUI::Desktop::the().rect().top_right().translated(-window->rect().width() - 8, 26);
new_window_location = GUI::Desktop::the().rect().top_right().translated(-window->rect().width() - 24, 26);
else
new_window_location = last_window_rect.bottom_left().translated(0, 8);
new_window_location = last_window_rect.bottom_left().translated(0, 10);
if (window->rect().location() != new_window_location) {
window->move_to(new_window_location);
window->set_original_rect(window->rect());
@ -60,7 +60,9 @@ NotificationWindow::NotificationWindow(const String& text, const String& title,
{
s_windows.append(this);
set_window_type(GUI::WindowType::Tooltip);
set_window_type(GUI::WindowType::Notification);
set_resizable(false);
set_minimizable(false);
Gfx::Rect lowest_notification_rect_on_screen;
for (auto& window : s_windows) {
@ -69,12 +71,12 @@ NotificationWindow::NotificationWindow(const String& text, const String& title,
}
Gfx::Rect rect;
rect.set_width(240);
rect.set_width(220);
rect.set_height(40);
rect.set_location(GUI::Desktop::the().rect().top_right().translated(-rect.width() - 8, 26));
rect.set_location(GUI::Desktop::the().rect().top_right().translated(-rect.width() - 24, 26));
if (!lowest_notification_rect_on_screen.is_null())
rect.set_location(lowest_notification_rect_on_screen.bottom_left().translated(0, 8));
rect.set_location(lowest_notification_rect_on_screen.bottom_left().translated(0, 10));
set_rect(rect);
@ -108,13 +110,10 @@ NotificationWindow::NotificationWindow(const String& text, const String& title,
right_container.set_preferred_size(36, 0);
right_container.set_layout<GUI::HorizontalBoxLayout>();
auto& button = right_container.add<GUI::Button>("Okay");
button.on_click = [this] {
auto this_window_index = s_windows.find_first_index(this);
if (this_window_index.has_value())
s_windows.remove(this_window_index.value());
close();
on_close_request = [this] {
s_windows.remove_first_matching([this](auto& entry) { return entry == this; });
update_notification_window_locations();
return CloseRequestDecision::Close;
};
}