mirror of
https://github.com/RGBCube/serenity
synced 2025-05-20 12:55:08 +00:00
WindowServer: Fixed Menubar resize issue
The menubar bar wasn't being resized correctly, as the underlying Window was never being resized when `DisplayProperties` was chaning the resolution while the system was running. `m_window` now gets the correct window size when it's been updated, so a reboot isn't required.
This commit is contained in:
parent
f37cf5ea4a
commit
d0c11bbcc3
3 changed files with 19 additions and 3 deletions
|
@ -9,6 +9,7 @@
|
|||
WSMenuManager::WSMenuManager()
|
||||
{
|
||||
m_username = getlogin();
|
||||
m_needs_window_resize = false;
|
||||
|
||||
m_timer = CTimer::construct(300, [this] {
|
||||
static time_t last_update_time;
|
||||
|
@ -45,6 +46,11 @@ void WSMenuManager::draw()
|
|||
auto& wm = WSWindowManager::the();
|
||||
auto menubar_rect = wm.menubar_rect();
|
||||
|
||||
if (m_needs_window_resize) {
|
||||
m_window->set_rect(menubar_rect);
|
||||
m_needs_window_resize = false;
|
||||
}
|
||||
|
||||
Painter painter(*window().backing_store());
|
||||
|
||||
painter.fill_rect(menubar_rect, Color::WarmGray);
|
||||
|
@ -157,3 +163,8 @@ void WSMenuManager::handle_menu_mouse_event(WSMenu& menu, const WSMouseEvent& ev
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void WSMenuManager::set_needs_window_resize()
|
||||
{
|
||||
m_needs_window_resize = true;
|
||||
}
|
|
@ -21,6 +21,8 @@ public:
|
|||
|
||||
Vector<WeakPtr<WSMenu>>& open_menu_stack() { return m_open_menu_stack; }
|
||||
|
||||
void set_needs_window_resize();
|
||||
|
||||
private:
|
||||
WSWindow& window() { return *m_window; }
|
||||
const WSWindow& window() const { return *m_window; }
|
||||
|
@ -36,4 +38,6 @@ private:
|
|||
RefPtr<CTimer> m_timer;
|
||||
|
||||
Vector<WeakPtr<WSMenu>> m_open_menu_stack;
|
||||
|
||||
bool m_needs_window_resize;
|
||||
};
|
||||
|
|
|
@ -196,6 +196,7 @@ const Font& WSWindowManager::app_menu_font() const
|
|||
void WSWindowManager::set_resolution(int width, int height)
|
||||
{
|
||||
WSCompositor::the().set_resolution(width, height);
|
||||
m_menu_manager.set_needs_window_resize();
|
||||
WSClientConnection::for_each_client([&](WSClientConnection& client) {
|
||||
client.notify_about_new_screen_rect(WSScreen::the().rect());
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue