diff --git a/quickshell/Modals/Common/DankModal.qml b/quickshell/Modals/Common/DankModal.qml index 3c94d189..45aad873 100644 --- a/quickshell/Modals/Common/DankModal.qml +++ b/quickshell/Modals/Common/DankModal.qml @@ -246,6 +246,11 @@ Item { bottom: root.useSingleWindow } + BackgroundEffect.blurRegion: Region { + item: shouldBeVisible ? modalContainer : null + radius: root.cornerRadius + } + WlrLayershell.margins { left: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr)) top: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr)) @@ -380,9 +385,9 @@ Item { Rectangle { anchors.fill: parent color: root.backgroundColor - border.color: root.borderColor - border.width: root.borderWidth radius: root.cornerRadius + border.color: Theme.outline + border.width: 1 } FocusScope { diff --git a/quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml b/quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml index cf7f3a12..d9347b7b 100644 --- a/quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml +++ b/quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml @@ -291,6 +291,14 @@ Item { right: true } + BackgroundEffect.blurRegion: Region { + x: contentVisible ? root.modalX : 0 + y: contentVisible ? root.modalY : 0 + width: contentVisible ? root.modalWidth : 0 + height: contentVisible ? root.modalHeight : 0 + radius: root.cornerRadius + } + mask: Region { item: spotlightOpen ? fullScreenMask : null } @@ -359,8 +367,6 @@ Item { Rectangle { anchors.fill: parent color: root.backgroundColor - border.color: root.borderColor - border.width: root.borderWidth radius: root.cornerRadius } @@ -386,6 +392,14 @@ Item { event.accepted = true; } } + + Rectangle { + anchors.fill: parent + radius: root.cornerRadius + color: "transparent" + border.color: Theme.outline + border.width: 1 + } } } } diff --git a/quickshell/Modals/DankLauncherV2/LauncherContent.qml b/quickshell/Modals/DankLauncherV2/LauncherContent.qml index 2a4b64d6..82fff0a1 100644 --- a/quickshell/Modals/DankLauncherV2/LauncherContent.qml +++ b/quickshell/Modals/DankLauncherV2/LauncherContent.qml @@ -279,9 +279,6 @@ FocusScope { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.leftMargin: root.parentModal?.borderWidth ?? 1 - anchors.rightMargin: root.parentModal?.borderWidth ?? 1 - anchors.bottomMargin: root.parentModal?.borderWidth ?? 1 readonly property bool showFooter: SettingsData.dankLauncherV2Size !== "micro" && SettingsData.dankLauncherV2ShowFooter height: showFooter ? 36 : 0 visible: showFooter @@ -290,7 +287,7 @@ FocusScope { Rectangle { anchors.fill: parent anchors.topMargin: -Theme.cornerRadius - color: Theme.surfaceContainerHigh + color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) radius: Theme.cornerRadius } diff --git a/quickshell/Modules/DankBar/DankBarWindow.qml b/quickshell/Modules/DankBar/DankBarWindow.qml index c51f318c..ca3f7d80 100644 --- a/quickshell/Modules/DankBar/DankBarWindow.qml +++ b/quickshell/Modules/DankBar/DankBarWindow.qml @@ -96,6 +96,10 @@ PanelWindow { } } + BackgroundEffect.blurRegion: Region { + item: barUnitInset + } + WlrLayershell.layer: dBarLayer WlrLayershell.namespace: "dms:bar" diff --git a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml index 5fac19cd..11e466ac 100644 --- a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml +++ b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml @@ -13,6 +13,14 @@ PanelWindow { WlrLayershell.namespace: "dms:notification-popup" + BackgroundEffect.blurRegion: Region { + x: content.x + bgShadowLayer.x + y: content.y + bgShadowLayer.y + width: bgShadowLayer.width + height: bgShadowLayer.height + radius: !win._finalized && !win.exiting ? Theme.cornerRadius : 0 + } + required property var notificationData required property string notificationId readonly property bool hasValidData: notificationData && notificationData.notification @@ -267,6 +275,14 @@ PanelWindow { } } + Rectangle { + anchors.fill: parent + radius: Theme.cornerRadius + color: "transparent" + border.color: Theme.outline + border.width: 1 + } + Rectangle { id: backgroundShape anchors.fill: parent diff --git a/quickshell/Widgets/DankOSD.qml b/quickshell/Widgets/DankOSD.qml index 821ba370..ffd7d91f 100644 --- a/quickshell/Widgets/DankOSD.qml +++ b/quickshell/Widgets/DankOSD.qml @@ -104,6 +104,12 @@ PanelWindow { } WlrLayershell.exclusiveZone: -1 WlrLayershell.keyboardFocus: WlrKeyboardFocus.None + + BackgroundEffect.blurRegion: Region { + item: shouldBeVisible ? osdContainer : null + radius: Theme.cornerRadius + } + color: "transparent" readonly property real dpr: CompositorService.getScreenScale(screen) diff --git a/quickshell/Widgets/DankPopout.qml b/quickshell/Widgets/DankPopout.qml index d3f0798b..55554ede 100644 --- a/quickshell/Widgets/DankPopout.qml +++ b/quickshell/Widgets/DankPopout.qml @@ -345,6 +345,11 @@ Item { bottom: !useBackgroundWindow } + BackgroundEffect.blurRegion: Region { + item: shouldBeVisible ? contentContainer : null + radius: Theme.cornerRadius + } + WlrLayershell.margins { left: useBackgroundWindow ? (root.alignedX - shadowBuffer) : 0 top: useBackgroundWindow ? (root.alignedY - shadowBuffer) : 0 @@ -470,7 +475,7 @@ Item { anchors.fill: parent radius: Theme.cornerRadius color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) - border.color: Theme.outlineMedium + border.color: Theme.outline border.width: 1 }