From 1d35923f0c1f7b57912a73769c1897d066fb71d2 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 9 Jan 2019 19:22:38 +0100 Subject: [PATCH] Also disable shortcut options when x11 is disabled --- src/settings/shortcutssettingspage.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp index efadce186..b8acb4797 100644 --- a/src/settings/shortcutssettingspage.cpp +++ b/src/settings/shortcutssettingspage.cpp @@ -191,9 +191,11 @@ void GlobalShortcutsSettingsPage::X11Changed(bool) { if (ui_->checkbox_x11->isChecked()) { ui_->list->setEnabled(true); + ui_->shortcut_options->setEnabled(true); } else { ui_->list->setEnabled(false); + ui_->shortcut_options->setEnabled(false); } } @@ -207,17 +209,22 @@ void GlobalShortcutsSettingsPage::DBusChanged(bool) { if (ui_->checkbox_x11->isEnabled()) { ui_->checkbox_x11->setEnabled(false); ui_->list->setEnabled(false); + ui_->shortcut_options->setEnabled(false); } if (ui_->checkbox_x11->isChecked()) { ui_->checkbox_x11->setChecked(false); ui_->list->setEnabled(false); + ui_->shortcut_options->setEnabled(false); } } else { if (!ui_->checkbox_x11->isEnabled()) { ui_->checkbox_x11->setEnabled(true); - if (ui_->checkbox_x11->isChecked()) ui_->list->setEnabled(true); + if (ui_->checkbox_x11->isChecked()) { + ui_->list->setEnabled(true); + ui_->shortcut_options->setEnabled(true); + } } }