From 041c01f3a47f787a2807aab04178d6f3b0cb0af3 Mon Sep 17 00:00:00 2001
From: kirillpt <kirp@dismail.de>
Date: Wed, 25 Nov 2020 19:31:03 +0300
Subject: [PATCH] made this: if Tray become disabled and startInTray was
enabled, startInTray before blocks, goes disabled too
---
src/UserSettingsPage.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 39b01f71f..76825a989 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -549,8 +549,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
cameraFrameRateCombo_ = new QComboBox{this};
timelineMaxWidthSpin_ = new QSpinBox{this};
- if (!settings_->tray())
+ if (!settings_->tray()) {
+ startInTrayToggle_->setState(false);
startInTrayToggle_->setDisabled(true);
+ }
avatarCircles_->setFixedSize(64, 48);
@@ -875,6 +877,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
if (enabled) {
startInTrayToggle_->setEnabled(true);
} else {
+ startInTrayToggle_->setState(false);
startInTrayToggle_->setDisabled(true);
}
emit trayOptionChanged(enabled);
@@ -971,7 +974,6 @@ UserSettingsPage::showEvent(QShowEvent *)
utils::restoreCombobox(themeCombo_, settings_->theme());
utils::restoreCombobox(ringtoneCombo_, settings_->ringtone());
- // FIXME: Toggle treats true as "off"
trayToggle_->setState(settings_->tray());
startInTrayToggle_->setState(settings_->startInTray());
groupViewToggle_->setState(settings_->groupView());
--
GitLab