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

WindowServer: Make way for the out-of-process system menu

Browse source 
This patch removes the internal system menu from WindowServer and
replaces it with two IPC API's:

    SetSystemMenu(menu_id)
    SetSystemTheme(theme_path, theme_name)

These API's will allow us to complete the SystemMenu program and
move it entirely out of process.
This commit is contained in:
Andreas Kling 2020-02-17 20:05:14 +01:00
parent 189fa68c0b
commit 84520d8b59
8 changed files with 63 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Servers/WindowServer/WindowManager.cpp
View file

@ -933,7 +933,7 @@ void WindowManager::event(Core::Event& event)
if (key_event.key() == Key_Logo) {
if (key_event.type() == Event::KeyUp) {
if (!m_moved_or_resized_since_logo_keydown && !m_switcher.is_visible() && !m_move_window && !m_resize_window) {
MenuManager::the().toggle_menu(MenuManager::the().system_menu());
MenuManager::the().toggle_system_menu();
return;
}
@ -1225,9 +1225,11 @@ Gfx::Rect WindowManager::dnd_rect() const
return Gfx::Rect(location, { width, height }).inflated(4, 4);
}
void WindowManager::update_theme(String theme_path, String theme_name)
bool WindowManager::update_theme(String theme_path, String theme_name)
{
auto new_theme = Gfx::load_system_theme(theme_path);
if (!new_theme)
return false;
ASSERT(new_theme);
Gfx::set_system_theme(*new_theme);
m_palette = Gfx::PaletteImpl::create_with_shared_buffer(*new_theme);
@ -1241,10 +1243,12 @@ void WindowManager::update_theme(String theme_path, String theme_name)
}
return IterationDecision::Continue;
});
MenuManager::the().did_change_theme();
auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
wm_config->write_entry("Theme", "Name", theme_name);
wm_config->sync();
invalidate();
return true;
}
}