From 8eecc27cbc0030245c0a10791834382a95439e93 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Sat, 29 Aug 2020 12:19:41 -0400 Subject: [PATCH] Tweak delegate padding and color choice --- .../contents/ui/quicksettings/Delegate.qml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/containments/panel/package/contents/ui/quicksettings/Delegate.qml b/containments/panel/package/contents/ui/quicksettings/Delegate.qml index 62eaee32..a20382ac 100644 --- a/containments/panel/package/contents/ui/quicksettings/Delegate.qml +++ b/containments/panel/package/contents/ui/quicksettings/Delegate.qml @@ -32,21 +32,31 @@ ColumnLayout { signal panelClosed Rectangle { - Layout.preferredWidth: units.iconSizes.large + units.smallSpacing * 2 + Layout.preferredWidth: units.iconSizes.large + units.smallSpacing Layout.minimumHeight: width Layout.alignment: Qt.AlignHCenter radius: units.smallSpacing - border.color: Qt.rgba(PlasmaCore.ColorScope.textColor.r, PlasmaCore.ColorScope.textColor.g, PlasmaCore.ColorScope.textColor.b, 0.2) - color: toggled ? - Qt.rgba(PlasmaCore.ColorScope.highlightColor.r, PlasmaCore.ColorScope.highlightColor.g, PlasmaCore.ColorScope.highlightColor.b, iconMouseArea.pressed ? 0.5 : 0.3) : - Qt.rgba(PlasmaCore.ColorScope.textColor.r, PlasmaCore.ColorScope.textColor.g, PlasmaCore.ColorScope.textColor.b, iconMouseArea.pressed ? 0.5 : 0.1) + border.color: toggled ? + Qt.darker(Qt.rgba(PlasmaCore.ColorScope.highlightColor.r, PlasmaCore.ColorScope.highlightColor.g, PlasmaCore.ColorScope.highlightColor.b, 1), 1.25) : + Qt.rgba(PlasmaCore.ColorScope.textColor.r, PlasmaCore.ColorScope.textColor.g, PlasmaCore.ColorScope.textColor.b, 0.2) + color: { + if (toggled) { + return Qt.rgba(PlasmaCore.ColorScope.highlightColor.r, PlasmaCore.ColorScope.highlightColor.g, PlasmaCore.ColorScope.highlightColor.b, iconMouseArea.pressed ? 0.5 : 0.3); + } else { + if (iconMouseArea.pressed) { + return Qt.darker(Qt.rgba(PlasmaCore.ColorScope.backgroundColor.r, PlasmaCore.ColorScope.backgroundColor.g, PlasmaCore.ColorScope.backgroundColor.b, 0.9), 1.25); + } else { + return Qt.rgba(PlasmaCore.ColorScope.backgroundColor.r, PlasmaCore.ColorScope.backgroundColor.g, PlasmaCore.ColorScope.backgroundColor.b, 0.3); + } + } + } PlasmaCore.IconItem { id: icon colorGroup: PlasmaCore.ColorScope.colorGroup anchors { fill: parent - margins: units.smallSpacing * 2 + margins: units.smallSpacing } source: model.icon MouseArea {