0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

SystemMenu: Finish the implementation and start this at boot :^)

Browse source 
Fixes #1231.
This commit is contained in:
Andreas Kling 2020-02-17 20:08:16 +01:00
parent 84520d8b59
commit b711f1eab5
Notes: sideshowbarker 2024-07-19 09:15:27 +09:00
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Applications/SystemMenu/main.cpp
View file

@ -34,6 +34,7 @@
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h> #include <LibGUI/MenuBar.h>
#include <LibGUI/MessageBox.h> #include <LibGUI/MessageBox.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <stdio.h> #include <stdio.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@ -56,7 +57,6 @@ struct ThemeMetadata {
Color g_menu_selection_color; Color g_menu_selection_color;
int g_theme_index { 0 };
Vector<ThemeMetadata> g_themes; Vector<ThemeMetadata> g_themes;
RefPtr<GUI::Menu> g_themes_menu; RefPtr<GUI::Menu> g_themes_menu;
@ -67,16 +67,9 @@ int main(int argc, char** argv)
GUI::Application app(argc, argv); GUI::Application app(argc, argv);
auto menu = build_system_menu(); auto menu = build_system_menu();
menu->realize_menu_if_needed();
auto menubar = make<GUI::MenuBar>(); GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetSystemMenu>(menu->menu_id());
menubar->add_menu(move(menu));
app.set_menubar(move(menubar));
// FIXME: This window is just so we can see that the menu works.
// Once we have a way to make this the default system menu we can drop this.
auto window = GUI::Window::construct();
window->show();
return app.exec(); return app.exec();
} }
@ -163,7 +156,8 @@ NonnullRefPtr<GUI::Menu> build_system_menu()
g_themes_menu->add_action(GUI::Action::create(theme.name, [theme_identifier](auto&) { g_themes_menu->add_action(GUI::Action::create(theme.name, [theme_identifier](auto&) {
auto& theme = g_themes[theme_identifier]; auto& theme = g_themes[theme_identifier];
dbg() << "Theme switched to " << theme.name << " at path " << theme.path; dbg() << "Theme switched to " << theme.name << " at path " << theme.path;
// FIXME: Tell WindowServer to switch theme! auto response = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetSystemTheme>(theme.path, theme.name);
ASSERT(response->success());
})); }));
++theme_identifier; ++theme_identifier;
} }

4
Base/etc/SystemServer.ini
View file

@ -35,6 +35,10 @@ Priority=high
KeepAlive=1 KeepAlive=1
User=window User=window
[SystemMenu]
KeepAlive=1
User=anon
[Clock.MenuApplet] [Clock.MenuApplet]
KeepAlive=1 KeepAlive=1
User=anon User=anon