RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:17:35 +00:00
Code Issues Activity Actions

WindowServer+CPUGraph: Make menu applets be "regular" windows

Browse source 
Instead of implementing menu applets as their own thing, they are now
WSWindows of WSWindowType::MenuApplet.

This makes it much easier to work with them on the client side, since
you can just create a GWindow with the right type and you're in the
menubar doing applet stuff :^)
This commit is contained in:
Andreas Kling 2019-12-16 15:05:45 +01:00
parent 648ed76085
commit df129bbe0e
13 changed files with 97 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Servers/WindowServer/WSMenuManager.h
View file

@ -3,7 +3,6 @@
#include "WSMenu.h"
#include <LibCore/CObject.h>
#include <LibCore/CTimer.h>
#include <WindowServer/WSMenuApplet.h>
#include <WindowServer/WSWindow.h>
class AClientConnection;
@ -36,9 +35,9 @@ public:
void close_everyone_not_in_lineage(WSMenu&);
void close_menu_and_descendants(WSMenu&);
void add_applet(WSMenuApplet&);
void remove_applet(WSMenuApplet&);
void invalidate_applet(WSMenuApplet&, const Rect&);
void add_applet(WSWindow&);
void remove_applet(WSWindow&);
void invalidate_applet(const WSWindow&, const Rect&);
private:
void close_menus(const Vector<WSMenu*>&);
@ -49,7 +48,7 @@ private:
void handle_menu_mouse_event(WSMenu&, const WSMouseEvent&);
void draw();
void draw_applet(const WSMenuApplet&);
void draw_applet(const WSWindow&);
void tick_clock();
RefPtr<WSWindow> m_window;
@ -62,7 +61,7 @@ private:
RefPtr<GraphicsBitmap> m_muted_bitmap;
RefPtr<GraphicsBitmap> m_unmuted_bitmap;
Vector<WeakPtr<WSMenuApplet>> m_applets;
Vector<WeakPtr<WSWindow>> m_applets;
OwnPtr<AClientConnection> m_audio_client;