diff --git a/Commons/Color.qml b/Commons/Color.qml index dc1d554..d7636a0 100644 --- a/Commons/Color.qml +++ b/Commons/Color.qml @@ -44,14 +44,6 @@ Singleton { property color transparent: "transparent" - // ----------- - function applyOpacity(color, opacity) { - // Convert color to string and apply opacity - if (!color) - return "transparent" - return color.toString().replace("#", "#" + opacity) - } - // -------------------------------- // Default colors: RosePine QtObject { diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index 83ed66f..7cb54b7 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -392,7 +392,7 @@ Loader { id: terminalBackground anchors.fill: parent radius: Style.radiusM * scaling - color: Color.applyOpacity(Color.mSurface, "E6") + color: Qt.alpha(Color.mSurface, 0.9) border.color: Color.mPrimary border.width: Math.max(1, Style.borderM * scaling) @@ -401,7 +401,7 @@ Loader { Rectangle { width: parent.width height: 1 - color: Color.applyOpacity(Color.mPrimary, "1A") + color: Qt.alpha(Color.mPrimary, 0.1) y: index * 10 * scaling opacity: Style.opacityMedium SequentialAnimation on opacity { @@ -421,7 +421,7 @@ Loader { Rectangle { width: parent.width height: 40 * scaling - color: Color.applyOpacity(Color.mPrimary, "33") + color: Qt.alpha(Color.mPrimary, 0.2) topLeftRadius: Style.radiusS * scaling topRightRadius: Style.radiusS * scaling @@ -659,8 +659,7 @@ Loader { width: 120 * scaling height: 40 * scaling radius: Style.radiusS * scaling - color: executeButtonArea.containsMouse ? Color.mPrimary : Color.applyOpacity(Color.mPrimary, - "33") + color: executeButtonArea.containsMouse ? Color.mPrimary : Qt.alpha(Color.mPrimary, 0.2) border.color: Color.mPrimary border.width: Math.max(1, Style.borderS * scaling) enabled: !lockContext.unlockInProgress @@ -723,7 +722,7 @@ Loader { anchors.fill: parent radius: parent.radius color: Color.transparent - border.color: Color.applyOpacity(Color.mPrimary, "4D") + border.color: Qt.alpha(Color.mPrimary, 0.3) border.width: Math.max(1, Style.borderS * scaling) z: -1 @@ -756,7 +755,7 @@ Loader { width: 60 * scaling height: 60 * scaling radius: width * 0.5 - color: powerButtonArea.containsMouse ? Color.mError : Color.applyOpacity(Color.mError, "33") + color: powerButtonArea.containsMouse ? Color.mError : Qt.alpha(Color.mError, 0.2) border.color: Color.mError border.width: Math.max(1, Style.borderM * scaling) @@ -781,7 +780,7 @@ Loader { width: 60 * scaling height: 60 * scaling radius: width * 0.5 - color: restartButtonArea.containsMouse ? Color.mPrimary : Color.applyOpacity(Color.mPrimary, "33") + color: restartButtonArea.containsMouse ? Color.mPrimary : Qt.alpha(Color.mPrimary, Style.opacityLight) border.color: Color.mPrimary border.width: Math.max(1, Style.borderM * scaling) @@ -806,7 +805,7 @@ Loader { width: 60 * scaling height: 60 * scaling radius: width * 0.5 - color: suspendButtonArea.containsMouse ? Color.mSecondary : Color.applyOpacity(Color.mSecondary, "33") + color: suspendButtonArea.containsMouse ? Color.mSecondary : Qt.alpha(Color.mSecondary, 0.2) border.color: Color.mSecondary border.width: Math.max(1, Style.borderM * scaling) diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index 7e72f2c..f025edb 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -96,7 +96,7 @@ Variants { height: Math.max(80 * scaling, contentRow.implicitHeight + (Style.marginL * 2 * scaling)) clip: true radius: Style.radiusL * scaling - border.color: Color.applyOpacity(Color.mOutline, "33") + border.color: Qt.alpha(Color.mOutline, Style.opacityLight) border.width: Math.max(1, Style.borderS * scaling) color: Color.mSurface diff --git a/Modules/PowerPanel/PowerPanel.qml b/Modules/PowerPanel/PowerPanel.qml index 45de8fe..e6cfb01 100644 --- a/Modules/PowerPanel/PowerPanel.qml +++ b/Modules/PowerPanel/PowerPanel.qml @@ -126,7 +126,7 @@ NPanel { icon: timerActive ? "back_hand" : "close" tooltipText: timerActive ? "Cancel Timer" : "Close" Layout.alignment: Qt.AlignVCenter - colorBg: timerActive ? Color.applyOpacity(Color.mError, "20") : Color.transparent + colorBg: timerActive ? Qt.alpha(Color.mError, 0.08) : Color.transparent colorFg: timerActive ? Color.mError : Color.mOnSurface onClicked: { if (timerActive) { @@ -213,10 +213,12 @@ NPanel { height: Style.baseWidgetSize * 1.6 * scaling radius: Style.radiusS * scaling color: { - if (pending) - return Color.applyOpacity(Color.mPrimary, "20") - if (mouseArea.containsMouse) + if (pending) { + return Qt.alpha(Color.mPrimary, 0.08) + } + if (mouseArea.containsMouse) { return Color.mSecondary + } return Color.transparent } diff --git a/Modules/SettingsPanel/Extras/BarSectionEditor.qml b/Modules/SettingsPanel/Extras/BarSectionEditor.qml index cdfc8f6..fb17c34 100644 --- a/Modules/SettingsPanel/Extras/BarSectionEditor.qml +++ b/Modules/SettingsPanel/Extras/BarSectionEditor.qml @@ -182,10 +182,10 @@ NBox { sourceComponent: NIconButton { icon: "settings" sizeRatio: 0.6 - colorBorder: Color.applyOpacity(Color.mOutline, "40") + colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight) colorBg: Color.mOnSurface colorFg: Color.mOnPrimary - colorBgHover: Color.applyOpacity(Color.mOnPrimary, "40") + colorBgHover: Qt.alpha(Color.mOnPrimary, Style.opacityLight) colorFgHover: Color.mOnPrimary onClicked: { var dialog = Qt.createComponent("BarWidgetSettingsDialog.qml").createObject(root, { @@ -202,10 +202,10 @@ NBox { NIconButton { icon: "close" sizeRatio: 0.6 - colorBorder: Color.applyOpacity(Color.mOutline, "40") + colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight) colorBg: Color.mOnSurface colorFg: Color.mOnPrimary - colorBgHover: Color.applyOpacity(Color.mOnPrimary, "40") + colorBgHover: Qt.alpha(Color.mOnPrimary, Style.opacityLight) colorFgHover: Color.mOnPrimary onClicked: { removeWidget(sectionId, index) diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml index fe7782c..a5dd9a1 100644 --- a/Modules/SettingsPanel/Tabs/AudioTab.qml +++ b/Modules/SettingsPanel/Tabs/AudioTab.qml @@ -316,8 +316,8 @@ ColumnLayout { // Padding around the inner row property real pad: Style.marginS * scaling // Visuals - color: Color.applyOpacity(Color.mOnSurface, "20") - border.color: Color.applyOpacity(Color.mOnSurface, "50") + color: Qt.alpha(Color.mOnSurface, 0.125) + border.color: Qt.alpha(Color.mOnSurface, Style.opacityLight) border.width: Math.max(1, Style.borderS * scaling) // Content diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml index 97e52eb..8c10c8f 100644 --- a/Widgets/NPanel.qml +++ b/Widgets/NPanel.qml @@ -148,9 +148,7 @@ Loader { visible: true // Dim desktop if required - color: (root.active && !root.isClosing && Settings.data.general.dimDesktop) ? Color.applyOpacity( - Color.mShadow, - "BB") : Color.transparent + color: (root.active && !root.isClosing && Settings.data.general.dimDesktop) ? Qt.alpha(Color.mShadow, Style.opacityHeavy) : Color.transparent WlrLayershell.exclusionMode: ExclusionMode.Ignore WlrLayershell.namespace: "noctalia-panel"