diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml index 7796dfc5..a2753977 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml @@ -34,7 +34,7 @@ PluginComponent { id: detailRoot implicitHeight: detailColumn.implicitHeight + Theme.spacingM * 2 radius: Theme.cornerRadius - color: Theme.surfaceContainerHigh + color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) DankActionButton { anchors.top: parent.top @@ -252,7 +252,7 @@ PluginComponent { width: parent ? parent.width : 300 height: 50 radius: Theme.cornerRadius - color: Theme.surfaceContainerHighest + color: Theme.surfaceLight border.width: 1 border.color: Theme.outlineLight opacity: 1.0 diff --git a/quickshell/Modules/ControlCenter/Components/EditControls.qml b/quickshell/Modules/ControlCenter/Components/EditControls.qml index 69e4b62c..50531aa6 100644 --- a/quickshell/Modules/ControlCenter/Components/EditControls.qml +++ b/quickshell/Modules/ControlCenter/Components/EditControls.qml @@ -33,7 +33,7 @@ Row { closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: Rectangle { - color: Theme.surfaceContainer + color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) border.color: Theme.primarySelected border.width: 0 radius: Theme.cornerRadius diff --git a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml index 945aa248..8fc2d46c 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml @@ -207,9 +207,9 @@ Rectangle { width: parent.width height: 50 radius: Theme.cornerRadius - color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: 0 + color: deviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight + border.color: modelData === AudioService.source ? Theme.primary : Theme.outlineLight + border.width: modelData === AudioService.source ? 2 : 1 Row { anchors.left: parent.left diff --git a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml index 781a6c93..7e86ae47 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml @@ -218,9 +218,9 @@ Rectangle { width: parent.width height: 50 radius: Theme.cornerRadius - color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: 0 + color: deviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight + border.color: modelData === AudioService.sink ? Theme.primary : Theme.outlineLight + border.width: modelData === AudioService.sink ? 2 : 1 DankRipple { id: deviceRipple @@ -397,9 +397,9 @@ Rectangle { width: parent.width height: 50 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: 0 + color: Theme.surfaceLight + border.color: modelData === AudioService.sink ? Theme.primary : Theme.outlineLight + border.width: modelData === AudioService.sink ? 2 : 1 Row { anchors.left: parent.left diff --git a/quickshell/Modules/ControlCenter/Details/BatteryDetail.qml b/quickshell/Modules/ControlCenter/Details/BatteryDetail.qml index 26be6afa..1f0206a9 100644 --- a/quickshell/Modules/ControlCenter/Details/BatteryDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BatteryDetail.qml @@ -129,8 +129,9 @@ Rectangle { width: (parent.width - Theme.spacingM) / 2 height: 64 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.width: 0 + color: Theme.surfaceLight + border.color: Theme.outlineLight + border.width: 1 Column { anchors.centerIn: parent @@ -164,8 +165,9 @@ Rectangle { width: (parent.width - Theme.spacingM) / 2 height: 64 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.width: 0 + color: Theme.surfaceLight + border.color: Theme.outlineLight + border.width: 1 Column { anchors.centerIn: parent diff --git a/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml b/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml index 976a1277..0cad08c0 100644 --- a/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml +++ b/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml @@ -153,7 +153,7 @@ Item { width: 320 height: contentColumn.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.surfaceContainer + color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 opacity: modalVisible ? 1 : 0 diff --git a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml index 9d4d6f28..580ea9f1 100644 --- a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml @@ -229,7 +229,6 @@ Rectangle { width: parent.width height: 50 radius: Theme.cornerRadius - border.width: 0 Component.onCompleted: { if (!isConnected) @@ -243,8 +242,8 @@ Rectangle { if (isConnecting) return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12); if (deviceMouseArea.containsMouse) - return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08); - return Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency); + return Theme.primaryHoverLight; + return Theme.surfaceLight; } border.color: { @@ -252,8 +251,9 @@ Rectangle { return Theme.warning; if (isConnected) return Theme.primary; - return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12); + return Theme.outlineLight; } + border.width: (isConnecting || isConnected) ? 2 : 1 Row { anchors.left: parent.left @@ -490,9 +490,9 @@ Rectangle { width: parent.width height: 50 radius: Theme.cornerRadius - color: availableMouseArea.containsMouse && isInteractive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: 0 + color: availableMouseArea.containsMouse && isInteractive ? Theme.primaryHoverLight : Theme.surfaceLight + border.color: Theme.outlineLight + border.width: 1 opacity: isInteractive ? 1 : 0.6 Row { diff --git a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml index 6099ec12..90fbf9d1 100644 --- a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml @@ -79,9 +79,9 @@ Rectangle { width: parent.width height: 80 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: modelData.mount === currentMountPath ? 2 : 0 + color: Theme.surfaceLight + border.color: modelData.mount === currentMountPath ? Theme.primary : Theme.outlineLight + border.width: modelData.mount === currentMountPath ? 2 : 1 Row { anchors.left: parent.left diff --git a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml index defcb6eb..5f1738ae 100644 --- a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml @@ -308,9 +308,9 @@ Rectangle { width: parent.width height: wiredContentRow.implicitHeight + Theme.spacingM * 2 radius: Theme.cornerRadius - color: wiredNetworkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: Theme.primary - border.width: 0 + color: wiredNetworkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight + border.color: isActive ? Theme.primary : Theme.outlineLight + border.width: isActive ? 2 : 1 Row { id: wiredContentRow @@ -565,9 +565,9 @@ Rectangle { width: wifiContent.width height: wifiContentRow.implicitHeight + Theme.spacingM * 2 radius: Theme.cornerRadius - color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) - border.color: wifiDelegate.isConnected ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) - border.width: 0 + color: networkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight + border.color: wifiDelegate.isConnected ? Theme.primary : Theme.outlineLight + border.width: wifiDelegate.isConnected ? 2 : 1 Row { id: wifiContentRow diff --git a/quickshell/Widgets/DankButtonGroup.qml b/quickshell/Widgets/DankButtonGroup.qml index d8cc377d..02e145ed 100644 --- a/quickshell/Widgets/DankButtonGroup.qml +++ b/quickshell/Widgets/DankButtonGroup.qml @@ -89,7 +89,7 @@ Row { width: Math.max(contentItem.implicitWidth + root.buttonPadding * 2, root.minButtonWidth) + (selected ? 4 : 0) height: root.buttonHeight - color: selected ? Theme.buttonBg : Theme.surfaceVariant + color: selected ? Theme.buttonBg : Theme.withAlpha(Theme.surfaceVariant, Theme.popupTransparency) border.color: "transparent" border.width: 0 diff --git a/quickshell/Widgets/DankPopout.qml b/quickshell/Widgets/DankPopout.qml index fb476afb..fb5f0b09 100644 --- a/quickshell/Widgets/DankPopout.qml +++ b/quickshell/Widgets/DankPopout.qml @@ -576,14 +576,6 @@ Item { } } - Rectangle { - anchors.fill: parent - radius: Theme.cornerRadius - color: "transparent" - border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium - border.width: BlurService.borderWidth - } - Loader { id: contentLoader anchors.fill: parent @@ -591,6 +583,21 @@ Item { asynchronous: false } } + + Rectangle { + width: parent.width + height: parent.height + x: contentWrapper.x + y: contentWrapper.y + opacity: contentWrapper.opacity + scale: contentWrapper.scale + visible: contentWrapper.visible + radius: Theme.cornerRadius + color: "transparent" + border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium + border.width: BlurService.borderWidth + z: 100 + } } Item { diff --git a/quickshell/Widgets/VpnProfileDelegate.qml b/quickshell/Widgets/VpnProfileDelegate.qml index 060c07f1..e8594565 100644 --- a/quickshell/Widgets/VpnProfileDelegate.qml +++ b/quickshell/Widgets/VpnProfileDelegate.qml @@ -238,7 +238,7 @@ Rectangle { width: fieldContent.width + Theme.spacingM * 2 height: 32 radius: Theme.cornerRadius - 2 - color: Theme.surfaceContainerHigh + color: Theme.surfaceLight border.width: 1 border.color: Theme.outlineLight @@ -272,7 +272,9 @@ Rectangle { checked: configData ? (configData.autoconnect || false) : false visible: !VPNService.configLoading && configData !== null onToggled: checked => { - VPNService.updateConfig(profile.uuid, {autoconnect: checked}); + VPNService.updateConfig(profile.uuid, { + autoconnect: checked + }); } }