diff --git a/applets/notifications/package/contents/ui/global/Globals.qml b/applets/notifications/package/contents/ui/global/Globals.qml index 643d2eba6..45b0e34eb 100644 --- a/applets/notifications/package/contents/ui/global/Globals.qml +++ b/applets/notifications/package/contents/ui/global/Globals.qml @@ -456,7 +456,7 @@ QtObject { readonly property var notificationId: model.notificationId popupWidth: globals.popupWidth - type: (model.urgency === NotificationManager.Notifications.CriticalUrgency && notificationSettings.keepCriticalAlwaysOnTop) + type: model.urgency === NotificationManager.Notifications.CriticalUrgency || (model.urgency === NotificationManager.Notifications.NormalUrgency && notificationSettings.keepNormalAlwaysOnTop) ? PlasmaCore.Dialog.CriticalNotification : PlasmaCore.Dialog.Notification diff --git a/libnotificationmanager/kcfg/notificationsettings.kcfg b/libnotificationmanager/kcfg/notificationsettings.kcfg index 89b479efc..bd29d2927 100644 --- a/libnotificationmanager/kcfg/notificationsettings.kcfg +++ b/libnotificationmanager/kcfg/notificationsettings.kcfg @@ -9,9 +9,6 @@ true - - true - false diff --git a/libnotificationmanager/settings.cpp b/libnotificationmanager/settings.cpp index a893b232e..fdbb6dd31 100644 --- a/libnotificationmanager/settings.cpp +++ b/libnotificationmanager/settings.cpp @@ -347,20 +347,6 @@ bool Settings::dirty() const return d->dirty; } -bool Settings::keepCriticalAlwaysOnTop() const -{ - return d->notificationSettings.criticalAlwaysOnTop(); -} - -void Settings::setKeepCriticalAlwaysOnTop(bool enable) -{ - if (this->keepCriticalAlwaysOnTop() == enable) { - return; - } - d->notificationSettings.setCriticalAlwaysOnTop(enable); - d->setDirty(true); -} - bool Settings::criticalPopupsInDoNotDisturbMode() const { return d->notificationSettings.criticalInDndMode(); diff --git a/libnotificationmanager/settings.h b/libnotificationmanager/settings.h index d7d52d911..d4e2ec570 100644 --- a/libnotificationmanager/settings.h +++ b/libnotificationmanager/settings.h @@ -51,10 +51,6 @@ class NOTIFICATIONMANAGER_EXPORT Settings : public QObject * Whether to show critical notification popups in do not disturb mode. */ Q_PROPERTY(bool criticalPopupsInDoNotDisturbMode READ criticalPopupsInDoNotDisturbMode WRITE setCriticalPopupsInDoNotDisturbMode NOTIFY settingsChanged) - /** - * Whether to keep critical notifications always on top. - */ - Q_PROPERTY(bool keepCriticalAlwaysOnTop READ keepCriticalAlwaysOnTop WRITE setKeepCriticalAlwaysOnTop NOTIFY settingsChanged) /** * Whether to keep normal notifications always on top. */ @@ -268,9 +264,6 @@ public: bool criticalPopupsInDoNotDisturbMode() const; void setCriticalPopupsInDoNotDisturbMode(bool enable); - bool keepCriticalAlwaysOnTop() const; - void setKeepCriticalAlwaysOnTop(bool enable); - bool keepNormalAlwaysOnTop() const; void setKeepNormalAlwaysOnTop(bool enable);