From 6361584d4a92c351f4f66ddf7b7924beb11e55ae Mon Sep 17 00:00:00 2001 From: Arda Cinar Date: Fri, 9 Dec 2022 16:02:09 +0300 Subject: [PATCH] KeyboardSettings: Disable "activate keymap" button if keymap is active --- .../KeyboardSettings/KeyboardSettingsWidget.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp index e87952cad5..74e4305681 100644 --- a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp +++ b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp @@ -228,7 +228,13 @@ KeyboardSettingsWidget::KeyboardSettingsWidget() m_selected_keymaps_listview->on_selection_change = [&]() { auto& selection = m_selected_keymaps_listview->selection(); m_remove_keymap_button->set_enabled(!selection.is_empty() && keymaps_list_model.keymaps().size() > 1); - m_activate_keymap_button->set_enabled(!selection.is_empty()); + if (selection.is_empty()) { + m_activate_keymap_button->set_enabled(false); + } else { + auto& highlighted_keymap = keymaps_list_model.keymap_at(selection.first().row()); + auto& active_keymap = keymaps_list_model.active_keymap(); + m_activate_keymap_button->set_enabled(highlighted_keymap != active_keymap); + } }; m_test_typing_area = *find_descendant_of_type_named("test_typing_area");