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

LibGUI: Allow setting window icon before show().

Browse source
This commit is contained in:
rhin123 2019-08-02 14:02:56 -05:00 • committed by Andreas Kling
parent 33b0c4cfaf
commit c02868f000
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibGUI/GWindow.cpp
View file

@ -87,6 +87,8 @@ void GWindow::show()
auto response = GWindowServerConnection::the().sync_request(request, WSAPI_ServerMessage::Type::DidCreateWindow); auto response = GWindowServerConnection::the().sync_request(request, WSAPI_ServerMessage::Type::DidCreateWindow);
m_window_id = response.window_id; m_window_id = response.window_id;
apply_icon();
reified_windows.set(m_window_id, this); reified_windows.set(m_window_id, this);
update(); update();
} }
@ -626,8 +628,6 @@ void GWindow::set_icon(const GraphicsBitmap* icon)
{ {
if (m_icon == icon) if (m_icon == icon)
return; return;
if (!m_window_id)
return;
m_icon = create_shared_bitmap(GraphicsBitmap::Format::RGBA32, icon->size()); m_icon = create_shared_bitmap(GraphicsBitmap::Format::RGBA32, icon->size());
{ {
@ -635,6 +635,17 @@ void GWindow::set_icon(const GraphicsBitmap* icon)
painter.blit({ 0, 0 }, *icon, icon->rect()); painter.blit({ 0, 0 }, *icon, icon->rect());
} }
apply_icon();
}
void GWindow::apply_icon()
{
if (!m_icon)
return;
if (!m_window_id)
return;
int rc = seal_shared_buffer(m_icon->shared_buffer_id()); int rc = seal_shared_buffer(m_icon->shared_buffer_id());
ASSERT(rc == 0); ASSERT(rc == 0);
@ -649,7 +660,7 @@ void GWindow::set_icon(const GraphicsBitmap* icon)
message.type = WSAPI_ClientMessage::Type::SetWindowIconBitmap; message.type = WSAPI_ClientMessage::Type::SetWindowIconBitmap;
message.window_id = m_window_id; message.window_id = m_window_id;
message.window.icon_buffer_id = m_icon->shared_buffer_id(); message.window.icon_buffer_id = m_icon->shared_buffer_id();
message.window.icon_size = icon->size(); message.window.icon_size = m_icon->size();
GWindowServerConnection::the().post_message_to_server(message); GWindowServerConnection::the().post_message_to_server(message);
} }

1
Libraries/LibGUI/GWindow.h
View file

@ -120,6 +120,7 @@ public:
void set_override_cursor(GStandardCursor); void set_override_cursor(GStandardCursor);
void set_icon(const GraphicsBitmap*); void set_icon(const GraphicsBitmap*);
void apply_icon();
const GraphicsBitmap* icon() const { return m_icon.ptr(); } const GraphicsBitmap* icon() const { return m_icon.ptr(); }
Vector<GWidget*> focusable_widgets() const; Vector<GWidget*> focusable_widgets() const;