RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:47:34 +00:00
Code Issues Activity Actions

KeyboardSettings: Rename m_current_applied_keymap

Browse source 
Rename it to m_initial_active_keymap to denote that it's the keymap that
was active when the application started up.
This commit is contained in:
Nícolas F. R. A. Prado 2022-02-24 22:13:11 -05:00 • committed by Andreas Kling
parent 256744ebdf
commit a48d7d6adc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
View file

@ -153,8 +153,8 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
auto json = JsonValue::from_string(proc_keymap->read_all()).release_value_but_fixme_should_propagate_errors();
auto const& keymap_object = json.as_object();
VERIFY(keymap_object.has("keymap"));
m_current_applied_keymap = keymap_object.get("keymap").to_string();
dbgln("KeyboardSettings thinks the current keymap is: {}", m_current_applied_keymap);
m_initial_active_keymap = keymap_object.get("keymap").to_string();
dbgln("KeyboardSettings thinks the current keymap is: {}", m_initial_active_keymap);
auto mapper_config(Core::ConfigFile::open("/etc/Keyboard.ini").release_value_but_fixme_should_propagate_errors());
auto keymaps = mapper_config->read_entry("Mapping", "Keymaps", "");
@ -171,7 +171,7 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
keymaps_list_model.add_keymap(keymap);
}
keymaps_list_model.set_active_keymap(m_current_applied_keymap);
keymaps_list_model.set_active_keymap(m_initial_active_keymap);
m_add_keymap_button = find_descendant_of_type_named<GUI::Button>("add_keymap_button");