LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-04 01:05:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Keymap Applet: Spawn KeyboardSettings when clicking

Browse Source
This commit is contained in:
Maciej 2022-02-04 21:04:25 +01:00 committed by Andreas Kling
parent e087cd574e
commit 99e3e42fa5
Notes: sideshowbarker 2024-07-17 19:47:39 +09:00 
Author: https://github.com/sppmacd
Commit: https://github.com/SerenityOS/serenity/commit/99e3e42fa55
Pull-request: https://github.com/SerenityOS/serenity/pull/12285
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Userland/Applets/Keymap/KeymapStatusWindow.cpp
View File

@ -5,20 +5,29 @@
*/
#include "KeymapStatusWindow.h"
#include <LibCore/Process.h>
#include <LibGUI/Painter.h>
#include <LibGUI/WindowManagerServerConnection.h>
#include <LibKeyboard/CharacterMap.h>
void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event)
{
if (event.button() != GUI::MouseButton::Primary)
return;
Core::Process::spawn("/bin/KeyboardSettings");
}
KeymapStatusWindow::KeymapStatusWindow()
{
set_window_type(GUI::WindowType::Applet);
set_has_alpha_channel(true);
m_label = &set_main_widget<GUI::Label>();
m_status_widget = &set_main_widget<KeymapStatusWidget>();
auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
auto current_keymap_name = current_keymap.character_map_name();
m_label->set_tooltip(current_keymap_name);
m_label->set_text(current_keymap_name.substring(0, 2));
m_status_widget->set_tooltip(current_keymap_name);
m_status_widget->set_text(current_keymap_name.substring(0, 2));
}
KeymapStatusWindow::~KeymapStatusWindow()
@ -36,9 +45,9 @@ void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
void KeymapStatusWindow::set_keymap_text(const String& keymap)
{
GUI::Painter painter(*m_label);
painter.clear_rect(m_label->rect(), Color::from_rgba(0));
GUI::Painter painter(*m_status_widget);
painter.clear_rect(m_status_widget->rect(), Color::from_rgba(0));
m_label->set_tooltip(keymap);
m_label->set_text(keymap.substring(0, 2));
m_status_widget->set_tooltip(keymap);
m_status_widget->set_text(keymap.substring(0, 2));
}

9
Userland/Applets/Keymap/KeymapStatusWindow.h
View File

@ -9,19 +9,22 @@
#include <LibGUI/Label.h>
#include <LibGUI/Window.h>
class KeymapStatusWidget;
class KeymapStatusWidget : public GUI::Label {
C_OBJECT(KeymapStatusWidget);
virtual void mousedown_event(GUI::MouseEvent& event) override;
};
class KeymapStatusWindow final : public GUI::Window {
C_OBJECT(KeymapStatusWindow)
public:
virtual ~KeymapStatusWindow() override;
private:
void wm_event(GUI::WMEvent&) override;
virtual void wm_event(GUI::WMEvent&) override;
KeymapStatusWindow();
RefPtr<GUI::Label> m_label;
RefPtr<KeymapStatusWidget> m_status_widget;
void set_keymap_text(String const& keymap);
};

4
Userland/Applets/Keymap/main.cpp
View File

@ -13,7 +13,7 @@
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(Core::System::pledge("stdio recvfd sendfd rpath unix getkeymap"));
TRY(Core::System::pledge("stdio recvfd sendfd rpath unix getkeymap proc exec"));
auto app = TRY(GUI::Application::try_create(arguments));
@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->show();
window->make_window_manager(WindowServer::WMEventMask::KeymapChanged);
TRY(Core::System::pledge("stdio recvfd sendfd rpath getkeymap"));
TRY(Core::System::pledge("stdio recvfd sendfd rpath getkeymap proc exec"));
return app->exec();
}