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

WindowServer: Switch menubar based on the currently active window.

Browse source
This commit is contained in:
Andreas Kling 2019-02-13 00:19:21 +01:00
parent 4f33fb3a1a
commit 732f273949
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WindowServer/WSWindow.h
View file

@ -20,6 +20,8 @@ public:
explicit WSWindow(WSMenu&); explicit WSWindow(WSMenu&);
virtual ~WSWindow() override; virtual ~WSWindow() override;
const Process* process() const { return m_process; }
WSWindowType type() const { return m_type; } WSWindowType type() const { return m_type; }
int window_id() const { return m_window_id; } int window_id() const { return m_window_id; }

22
WindowServer/WSWindowManager.cpp
View file

@ -707,6 +707,12 @@ void WSWindowManager::set_active_window(WSWindow* window)
if (m_active_window) { if (m_active_window) {
WSMessageLoop::the().post_message(m_active_window.ptr(), make<WSMessage>(WSMessage::WindowActivated)); WSMessageLoop::the().post_message(m_active_window.ptr(), make<WSMessage>(WSMessage::WindowActivated));
invalidate(*m_active_window); invalidate(*m_active_window);
auto it = m_app_menubars.find(window->process());
if (it != m_app_menubars.end())
set_current_menubar((*it).value);
else
set_current_menubar(nullptr);
} }
} }
@ -883,6 +889,13 @@ int WSWindowManager::api$menu_add_item(int menu_id, unsigned identifier, String&
return 0; return 0;
} }
const Process* WSWindowManager::active_process() const
{
if (m_active_window)
return m_active_window->process();
return nullptr;
}
int WSWindowManager::api$app_set_menubar(int menubar_id) int WSWindowManager::api$app_set_menubar(int menubar_id)
{ {
LOCKER(m_lock); LOCKER(m_lock);
@ -890,11 +903,9 @@ int WSWindowManager::api$app_set_menubar(int menubar_id)
if (it == m_menubars.end()) if (it == m_menubars.end())
return -EBADMENUBAR; return -EBADMENUBAR;
auto& menubar = *(*it).value; auto& menubar = *(*it).value;
if (&menubar == m_current_menubar) m_app_menubars.set(current, &menubar);
return 0; if (active_process() == current)
set_current_menubar(&menubar); set_current_menubar(&menubar);
// FIXME: Maybe leave the system menu even if the app menu changes?
close_current_menu();
invalidate(); invalidate();
return 0; return 0;
} }
@ -927,4 +938,5 @@ void WSWindowManager::destroy_all_menus(Process& process)
set_current_menubar(nullptr); set_current_menubar(nullptr);
for (int menubar_id : menubar_ids) for (int menubar_id : menubar_ids)
m_menubars.remove(menubar_id); m_menubars.remove(menubar_id);
m_app_menubars.remove(current);
} }

2
WindowServer/WSWindowManager.h
View file

@ -30,6 +30,7 @@ public:
void notify_rect_changed(WSWindow&, const Rect& oldRect, const Rect& newRect); void notify_rect_changed(WSWindow&, const Rect& oldRect, const Rect& newRect);
WSWindow* active_window() { return m_active_window.ptr(); } WSWindow* active_window() { return m_active_window.ptr(); }
const Process* active_process() const;
void move_to_front(WSWindow&); void move_to_front(WSWindow&);
@ -152,4 +153,5 @@ private:
WSMenu* m_current_menu { nullptr }; WSMenu* m_current_menu { nullptr };
HashMap<int, OwnPtr<WSMenuBar>> m_menubars; HashMap<int, OwnPtr<WSMenuBar>> m_menubars;
HashMap<int, OwnPtr<WSMenu>> m_menus; HashMap<int, OwnPtr<WSMenu>> m_menus;
HashMap<const Process*, WSMenuBar*> m_app_menubars;
}; };