1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 15:37:43 +00:00

Applets/Keymap: Repaint applet on demand only

Instead of poking into the the applet window backing store whenever
the keymap changes, we now drive the GUI updates properly via
update() and paint_event().

This fixes an issue where changing the system font would cause a
"ghosting" effect in the keymap applet.
This commit is contained in:
Andreas Kling 2023-03-03 22:46:01 +01:00
parent 66c04b98f1
commit 5979ce8316
3 changed files with 28 additions and 28 deletions

View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,10 +9,13 @@
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/ConnectionToWindowManagerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Process.h> #include <LibGUI/Process.h>
#include <LibGfx/Point.h> #include <LibGfx/Point.h>
#include <LibKeyboard/CharacterMap.h>
KeymapStatusWidget::KeymapStatusWidget() = default;
KeymapStatusWidget::~KeymapStatusWidget() = default;
void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event) void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event)
{ {
@ -59,15 +63,16 @@ ErrorOr<void> KeymapStatusWidget::refresh_menu()
return {}; return {};
} }
void KeymapStatusWidget::set_current_keymap(DeprecatedString const& keymap, ClearBackground clear_background) void KeymapStatusWidget::set_current_keymap(DeprecatedString const& keymap)
{ {
if (clear_background == ClearBackground::Yes) {
GUI::Painter painter(*this);
painter.clear_rect(rect(), Color::Transparent);
}
m_current_keymap = keymap; m_current_keymap = keymap;
set_tooltip(keymap); set_tooltip(keymap);
set_text(keymap.substring(0, 2)); }
void KeymapStatusWidget::paint_event(GUI::PaintEvent& event)
{
GUI::Painter painter(*this);
painter.add_clip_rect(event.rect());
painter.clear_rect(event.rect(), Gfx::Color::Transparent);
painter.draw_text(rect(), m_current_keymap.substring_view(0, 2), Gfx::TextAlignment::Center);
} }

View file

@ -1,34 +1,32 @@
/* /*
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <LibCore/FileWatcher.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/Label.h> #include <LibGUI/Widget.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Window.h>
enum class ClearBackground { class KeymapStatusWidget final : public GUI::Widget {
No,
Yes
};
class KeymapStatusWidget : public GUI::Label {
C_OBJECT(KeymapStatusWidget); C_OBJECT(KeymapStatusWidget);
virtual void mousedown_event(GUI::MouseEvent& event) override; public:
virtual ~KeymapStatusWidget() override;
void set_current_keymap(DeprecatedString const& keymap, ClearBackground clear_background = ClearBackground::Yes); void set_current_keymap(DeprecatedString const& keymap);
private: private:
RefPtr<GUI::Menu> m_context_menu; KeymapStatusWidget();
DeprecatedString m_current_keymap;
virtual void paint_event(GUI::PaintEvent&) override;
virtual void mousedown_event(GUI::MouseEvent&) override;
ErrorOr<void> refresh_menu(); ErrorOr<void> refresh_menu();
RefPtr<GUI::Menu> m_context_menu;
DeprecatedString m_current_keymap;
GUI::ActionGroup m_keymaps_group; GUI::ActionGroup m_keymaps_group;
}; };

View file

@ -6,8 +6,6 @@
*/ */
#include "KeymapStatusWindow.h" #include "KeymapStatusWindow.h"
#include <LibGUI/Painter.h>
#include <LibGUI/Process.h>
#include <LibKeyboard/CharacterMap.h> #include <LibKeyboard/CharacterMap.h>
KeymapStatusWindow::KeymapStatusWindow() KeymapStatusWindow::KeymapStatusWindow()
@ -17,8 +15,7 @@ KeymapStatusWindow::KeymapStatusWindow()
m_status_widget = set_main_widget<KeymapStatusWidget>().release_value_but_fixme_should_propagate_errors(); m_status_widget = set_main_widget<KeymapStatusWidget>().release_value_but_fixme_should_propagate_errors();
auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map()); auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
auto current_keymap_name = current_keymap.character_map_name(); m_status_widget->set_current_keymap(current_keymap.character_map_name());
m_status_widget->set_current_keymap(current_keymap_name, ClearBackground::No);
} }
void KeymapStatusWindow::wm_event(GUI::WMEvent& event) void KeymapStatusWindow::wm_event(GUI::WMEvent& event)