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

Userland: Migrate to String in notification system

Browse source
This commit is contained in:
kleines Filmröllchen 2023-08-31 18:50:32 +02:00 • committed by Andrew Kaster
parent f46b393d2d
commit a7c770268f
10 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ void ConnectionFromClient::die()
s_connections.remove(client_id());
}
void ConnectionFromClient::show_notification(DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const& icon)
void ConnectionFromClient::show_notification(String const& text, String const& title, Gfx::ShareableBitmap const& icon)
{
auto window = NotificationWindow::construct(client_id(), text, title, icon);
window->show();
@ -47,7 +47,7 @@ Messages::NotificationServer::UpdateNotificationIconResponse ConnectionFromClien
return !!window;
}
Messages::NotificationServer::UpdateNotificationTextResponse ConnectionFromClient::update_notification_text(DeprecatedString const& text, DeprecatedString const& title)
Messages::NotificationServer::UpdateNotificationTextResponse ConnectionFromClient::update_notification_text(String const& text, String const& title)
{
auto window = NotificationWindow::get_window_by_id(client_id());
if (window) {

4
Userland/Services/NotificationServer/ConnectionFromClient.h
View file

@ -23,10 +23,10 @@ public:
private:
explicit ConnectionFromClient(NonnullOwnPtr<Core::LocalSocket>, int client_id);
virtual void show_notification(DeprecatedString const&, DeprecatedString const&, Gfx::ShareableBitmap const&) override;
virtual void show_notification(String const&, String const&, Gfx::ShareableBitmap const&) override;
virtual void close_notification() override;
virtual Messages::NotificationServer::UpdateNotificationIconResponse update_notification_icon(Gfx::ShareableBitmap const&) override;
virtual Messages::NotificationServer::UpdateNotificationTextResponse update_notification_text(DeprecatedString const&, DeprecatedString const&) override;
virtual Messages::NotificationServer::UpdateNotificationTextResponse update_notification_text(String const&, String const&) override;
virtual Messages::NotificationServer::IsShowingResponse is_showing() override;
};

4
Userland/Services/NotificationServer/NotificationServer.ipc
View file

@ -2,9 +2,9 @@
endpoint NotificationServer
{
show_notification([UTF8] DeprecatedString text, [UTF8] DeprecatedString title, Gfx::ShareableBitmap icon) => ()
show_notification(String text, String title, Gfx::ShareableBitmap icon) => ()
update_notification_text([UTF8] DeprecatedString text, [UTF8] DeprecatedString title) => (bool still_showing)
update_notification_text(String text, String title) => (bool still_showing)
update_notification_icon(Gfx::ShareableBitmap icon) => (bool still_showing)

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

@ -38,7 +38,7 @@ static void update_notification_window_locations(Gfx::IntRect const& screen_rect
}
}
NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const& icon)
NotificationWindow::NotificationWindow(i32 client_id, String const& text, String const& title, Gfx::ShareableBitmap const& icon)
{
m_id = client_id;
@ -82,10 +82,10 @@ NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& te
auto& left_container = widget->add<GUI::Widget>();
left_container.set_layout<GUI::VerticalBoxLayout>();
m_title_label = &left_container.add<GUI::Label>(String::from_deprecated_string(title).release_value_but_fixme_should_propagate_errors());
m_title_label = &left_container.add<GUI::Label>(title);
m_title_label->set_font(Gfx::FontDatabase::default_font().bold_variant());
m_title_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_text_label = &left_container.add<GUI::Label>(String::from_deprecated_string(text).release_value_but_fixme_should_propagate_errors());
m_text_label = &left_container.add<GUI::Label>(text);
m_text_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
// FIXME: There used to be code for setting the tooltip here, but since we
@ -130,16 +130,16 @@ void NotificationWindow::leave_event(Core::Event&)
update_notification_window_locations(GUI::Desktop::the().rect());
}
void NotificationWindow::set_text(DeprecatedString const& value)
void NotificationWindow::set_text(String const& value)
{
m_text_label->set_text(String::from_deprecated_string(value).release_value_but_fixme_should_propagate_errors());
m_text_label->set_text(value);
if (m_hovering)
resize_to_fit_text();
}
void NotificationWindow::set_title(DeprecatedString const& value)
void NotificationWindow::set_title(String const& value)
{
m_title_label->set_text(String::from_deprecated_string(value).release_value_but_fixme_should_propagate_errors());
m_title_label->set_text(value);
}
void NotificationWindow::set_image(Gfx::ShareableBitmap const& image)

6
Userland/Services/NotificationServer/NotificationWindow.h
View file

@ -18,8 +18,8 @@ public:
virtual ~NotificationWindow() override = default;
void set_original_rect(Gfx::IntRect original_rect) { m_original_rect = original_rect; }
void set_text(DeprecatedString const&);
void set_title(DeprecatedString const&);
void set_text(String const&);
void set_title(String const&);
void set_image(Gfx::ShareableBitmap const&);
static RefPtr<NotificationWindow> get_window_by_id(i32 id);
@ -29,7 +29,7 @@ protected:
virtual void leave_event(Core::Event&) override;
private:
NotificationWindow(i32 client_id, DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const&);
NotificationWindow(i32 client_id, String const& text, String const& title, Gfx::ShareableBitmap const&);
virtual void screen_rects_change_event(GUI::ScreenRectsChangeEvent&) override;