OSD: add always on top setting

Notification: add always on top setting

Assets/settings-default.json

@@ -183,19 +183,19 @@
       "doNotDisturb": false,
       "monitors": [],
       "location": "top_right",
-      "alwaysOnTop": false,
+      "overlayLayer": true,
       "respectExpireTimeout": false,
       "lowUrgencyDuration": 3,
       "normalUrgencyDuration": 8,
       "criticalUrgencyDuration": 15
     },
-  "osd": {
-    "enabled": true,
-    "location": "top_right",
-    "monitors": [],
-    "autoHideMs": 2000,
-    "alwaysOnTop": false
-  },
+    "osd": {
+      "enabled": true,
+      "location": "top_right",
+      "monitors": [],
+      "autoHideMs": 2000,
+      "overlayLayer": true
+    },
   "audio": {
     "volumeStep": 5,
     "volumeOverdrive": false,

Commons/Settings.qml

@@ -312,7 +312,7 @@ Singleton {
       property bool doNotDisturb: false
       property list<string> monitors: []
       property string location: "top_right"
-      property bool alwaysOnTop: false
+      property bool overlayLayer: true
       property bool respectExpireTimeout: false
       property int lowUrgencyDuration: 3
       property int normalUrgencyDuration: 8
@@ -325,7 +325,7 @@ Singleton {
       property string location: "top_right"
       property list<string> monitors: []
       property int autoHideMs: 2000
-      property bool alwaysOnTop: false
+      property bool overlayLayer: true
     }
 
     // audio

Modules/Notification/Notification.qml

@@ -45,7 +45,7 @@ Variants {
       screen: modelData
 
       WlrLayershell.namespace: "noctalia-notifications"
-      WlrLayershell.layer: (Settings.data.notifications && Settings.data.notifications.alwaysOnTop) ? WlrLayer.Overlay : WlrLayer.Top
+      WlrLayershell.layer: (Settings.data.notifications && Settings.data.notifications.overlayLayer) ? WlrLayer.Overlay : WlrLayer.Top
 
       color: Color.transparent
 

Modules/OSD/OSD.qml

@@ -190,7 +190,7 @@ Variants {
       color: Color.transparent
 
       WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-      WlrLayershell.layer: (Settings.data.osd && Settings.data.osd.alwaysOnTop) ? WlrLayer.Overlay : WlrLayer.Top
+      WlrLayershell.layer: (Settings.data.osd && Settings.data.osd.overlayLayer) ? WlrLayer.Overlay : WlrLayer.Top
       exclusionMode: PanelWindow.ExclusionMode.Ignore
 
       Rectangle {

Modules/Settings/Tabs/NotificationsTab.qml

@@ -68,8 +68,8 @@ ColumnLayout {
     NToggle {
       label: I18n.tr("settings.notifications.settings.always-on-top.label")
       description: I18n.tr("settings.notifications.settings.always-on-top.description")
-      checked: Settings.data.notifications.alwaysOnTop
-      onToggled: checked => Settings.data.notifications.alwaysOnTop = checked
+      checked: Settings.data.notifications.overlayLayer
+      onToggled: checked => Settings.data.notifications.overlayLayer = checked
     }
 
     // OSD settings moved to the dedicated OSD tab

Modules/Settings/Tabs/OsdTab.qml

@@ -86,8 +86,8 @@ ColumnLayout {
     NToggle {
       label: I18n.tr("settings.osd.always-on-top.label")
       description: I18n.tr("settings.osd.always-on-top.description")
-      checked: Settings.data.osd.alwaysOnTop
-      onToggled: checked => Settings.data.osd.alwaysOnTop = checked
+      checked: Settings.data.osd.overlayLayer
+      onToggled: checked => Settings.data.osd.overlayLayer = checked
     }
 
     NLabel {

Modules/Toast/ToastScreen.qml

@@ -197,7 +197,7 @@ Item {
 
       color: Color.transparent
 
-      WlrLayershell.layer: WlrLayer.Overlay
+      WlrLayershell.layer: (Settings.data.notifications && Settings.data.notifications.overlayLayer) ? WlrLayer.Overlay : WlrLayer.Top
       WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
       exclusionMode: PanelWindow.ExclusionMode.Ignore