1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:17:44 +00:00

Keymap+WindowServer: Add context menu to keymap applet

Adding a context menu which lists configured keymaps and allows
setting the active keymap
This commit is contained in:
Timur Sultanov 2022-04-03 02:06:35 +03:00 committed by Andreas Kling
parent db11cfa2c5
commit 9906f41e01
11 changed files with 126 additions and 27 deletions

View file

@ -6,19 +6,10 @@
*/
#include "KeymapStatusWindow.h"
#include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Process.h>
#include <LibKeyboard/CharacterMap.h>
void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event)
{
if (event.button() != GUI::MouseButton::Primary)
return;
GUI::Process::spawn_or_show_error(window(), "/bin/KeyboardSettings"sv);
}
KeymapStatusWindow::KeymapStatusWindow()
{
set_window_type(GUI::WindowType::Applet);
@ -27,8 +18,7 @@ KeymapStatusWindow::KeymapStatusWindow()
auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
auto current_keymap_name = current_keymap.character_map_name();
m_status_widget->set_tooltip(current_keymap_name);
m_status_widget->set_text(current_keymap_name.substring(0, 2));
m_status_widget->set_current_keymap(current_keymap_name, ClearBackground::No);
}
void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
@ -42,9 +32,5 @@ void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
void KeymapStatusWindow::set_keymap_text(String const& keymap)
{
GUI::Painter painter(*m_status_widget);
painter.clear_rect(m_status_widget->rect(), Color::from_argb(0));
m_status_widget->set_tooltip(keymap);
m_status_widget->set_text(keymap.substring(0, 2));
m_status_widget->set_current_keymap(keymap);
}