RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +00:00
Code Issues Activity Actions

WindowServer: Move applet code from MenuManager to AppletManager.

Browse source 
Move applet logic to the own class. Remove applet code from MenuManager.
With new AppletManager applet order is configurable via WindowManager.ini file.
This commit is contained in:
asliturk 2020-02-09 20:37:42 +03:00 • committed by Andreas Kling
parent e5e162fe5a
commit 077ef556a7
9 changed files with 204 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Servers/WindowServer/MenuManager.h
View file

@ -43,7 +43,6 @@ public:
virtual ~MenuManager() override;
void refresh();
void calculate_applet_rects();
virtual void event(Core::Event&) override;
@ -72,15 +71,13 @@ public:
void close_all_menus_from_client(Badge<ClientConnection>, ClientConnection&);
void add_applet(Window&);
void remove_applet(Window&);
void invalidate_applet(const Window&, const Gfx::Rect&);
Color menu_selection_color() const { return m_menu_selection_color; }
Menu& system_menu() { return *m_system_menu; }
Menu* find_internal_menu_by_id(int);
int theme_index() const { return m_theme_index; }
Window& window() { return *m_window; }
template<typename Callback>
void for_each_active_menubar_menu(Callback callback)
{
@ -96,21 +93,17 @@ private:
void close_menus(const Vector<Menu*>&);
Window& window() { return *m_window; }
const Window& window() const { return *m_window; }
void handle_menu_mouse_event(Menu&, const MouseEvent&);
void draw();
void draw_applet(const Window&);
RefPtr<Window> m_window;
WeakPtr<Menu> m_current_menu;
Vector<WeakPtr<Menu>> m_open_menu_stack;
Vector<WeakPtr<Window>> m_applets;
bool m_needs_window_resize { false };
bool m_bar_open { false };