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

Taskbar: Reposition the applet area when the desktop rect changes

Browse source
This commit is contained in:
Andreas Kling 2021-03-30 23:39:34 +02:00
parent 0cd60a28ba
commit 2231205863
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -175,6 +175,19 @@ void TaskbarWindow::on_screen_rect_change(const Gfx::IntRect& rect)
{ {
Gfx::IntRect new_rect { rect.x(), rect.bottom() - taskbar_height() + 1, rect.width(), taskbar_height() }; Gfx::IntRect new_rect { rect.x(), rect.bottom() - taskbar_height() + 1, rect.width(), taskbar_height() };
set_rect(new_rect); set_rect(new_rect);
update_applet_area();
}
void TaskbarWindow::update_applet_area()
{
// NOTE: Widget layout is normally lazy, but here we have to force it right away so we can tell
// WindowServer where to place the applet area window.
if (!main_widget())
return;
main_widget()->do_layout();
Gfx::IntRect new_rect { {}, m_applet_area_size };
new_rect.center_within(m_applet_area_container->screen_relative_rect());
GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::WM_SetAppletAreaPosition>(new_rect.location());
} }
NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier) NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier)
@ -324,13 +337,9 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
} }
case GUI::Event::WM_AppletAreaSizeChanged: { case GUI::Event::WM_AppletAreaSizeChanged: {
auto& changed_event = static_cast<GUI::WMAppletAreaSizeChangedEvent&>(event); auto& changed_event = static_cast<GUI::WMAppletAreaSizeChangedEvent&>(event);
m_applet_area_size = changed_event.size();
m_applet_area_container->set_fixed_size(changed_event.size().width() + 8, 22); m_applet_area_container->set_fixed_size(changed_event.size().width() + 8, 22);
// NOTE: Widget layout is normally lazy, but here we have to force it right away so we can tell update_applet_area();
// WindowServer where to place the applet area window.
main_widget()->do_layout();
Gfx::IntRect new_rect { {}, changed_event.size() };
new_rect.center_within(m_applet_area_container->screen_relative_rect());
GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::WM_SetAppletAreaPosition>(new_rect.location());
break; break;
} }
default: default:

4
Userland/Services/Taskbar/TaskbarWindow.h
View file

@ -50,8 +50,12 @@ private:
virtual void wm_event(GUI::WMEvent&) override; virtual void wm_event(GUI::WMEvent&) override;
void update_applet_area();
NonnullRefPtr<GUI::Menu> m_start_menu; NonnullRefPtr<GUI::Menu> m_start_menu;
RefPtr<GUI::Widget> m_task_button_container; RefPtr<GUI::Widget> m_task_button_container;
RefPtr<Gfx::Bitmap> m_default_icon; RefPtr<Gfx::Bitmap> m_default_icon;
Gfx::IntSize m_applet_area_size;
RefPtr<GUI::Frame> m_applet_area_container; RefPtr<GUI::Frame> m_applet_area_container;
}; };