mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 20:12:43 +00:00 
			
		
		
		
	 5979ce8316
			
		
	
	
		5979ce8316
		
	
	
	
	
		
			
			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.
		
			
				
	
	
		
			33 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
 | |
|  * Copyright (c) 2022, the SerenityOS developers.
 | |
|  *
 | |
|  * SPDX-License-Identifier: BSD-2-Clause
 | |
|  */
 | |
| 
 | |
| #include "KeymapStatusWindow.h"
 | |
| #include <LibKeyboard/CharacterMap.h>
 | |
| 
 | |
| KeymapStatusWindow::KeymapStatusWindow()
 | |
| {
 | |
|     set_window_type(GUI::WindowType::Applet);
 | |
|     set_has_alpha_channel(true);
 | |
|     m_status_widget = set_main_widget<KeymapStatusWidget>().release_value_but_fixme_should_propagate_errors();
 | |
| 
 | |
|     auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
 | |
|     m_status_widget->set_current_keymap(current_keymap.character_map_name());
 | |
| }
 | |
| 
 | |
| void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
 | |
| {
 | |
|     if (event.type() == GUI::WMEvent::WM_KeymapChanged) {
 | |
|         auto& keymap_event = static_cast<GUI::WMKeymapChangedEvent&>(event);
 | |
|         auto keymap = keymap_event.keymap();
 | |
|         set_keymap_text(keymap);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void KeymapStatusWindow::set_keymap_text(DeprecatedString const& keymap)
 | |
| {
 | |
|     m_status_widget->set_current_keymap(keymap);
 | |
| }
 |