never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup: removed Color.applyOpacity in favor of Qt.alpha

Browse source
This commit is contained in:
LemmyCook 2025-09-04 11:29:45 -04:00
parent d53a404bf1
commit c1bec66151
7 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Commons/Color.qml
View file

@ -44,14 +44,6 @@ Singleton {
property color transparent: "transparent" 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 // Default colors: RosePine
QtObject { QtObject {

17
Modules/LockScreen/LockScreen.qml
View file

@ -392,7 +392,7 @@ Loader {
id: terminalBackground id: terminalBackground
anchors.fill: parent anchors.fill: parent
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
color: Color.applyOpacity(Color.mSurface, "E6") color: Qt.alpha(Color.mSurface, 0.9)
border.color: Color.mPrimary border.color: Color.mPrimary
border.width: Math.max(1, Style.borderM * scaling) border.width: Math.max(1, Style.borderM * scaling)
@ -401,7 +401,7 @@ Loader {
Rectangle { Rectangle {
width: parent.width width: parent.width
height: 1 height: 1
color: Color.applyOpacity(Color.mPrimary, "1A") color: Qt.alpha(Color.mPrimary, 0.1)
y: index * 10 * scaling y: index * 10 * scaling
opacity: Style.opacityMedium opacity: Style.opacityMedium
SequentialAnimation on opacity { SequentialAnimation on opacity {
@ -421,7 +421,7 @@ Loader {
Rectangle { Rectangle {
width: parent.width width: parent.width
height: 40 * scaling height: 40 * scaling
color: Color.applyOpacity(Color.mPrimary, "33") color: Qt.alpha(Color.mPrimary, 0.2)
topLeftRadius: Style.radiusS * scaling topLeftRadius: Style.radiusS * scaling
topRightRadius: Style.radiusS * scaling topRightRadius: Style.radiusS * scaling
@ -659,8 +659,7 @@ Loader {
width: 120 * scaling width: 120 * scaling
height: 40 * scaling height: 40 * scaling
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
color: executeButtonArea.containsMouse ? Color.mPrimary : Color.applyOpacity(Color.mPrimary, color: executeButtonArea.containsMouse ? Color.mPrimary : Qt.alpha(Color.mPrimary, 0.2)
"33")
border.color: Color.mPrimary border.color: Color.mPrimary
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)
enabled: !lockContext.unlockInProgress enabled: !lockContext.unlockInProgress
@ -723,7 +722,7 @@ Loader {
anchors.fill: parent anchors.fill: parent
radius: parent.radius radius: parent.radius
color: Color.transparent 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) border.width: Math.max(1, Style.borderS * scaling)
z: -1 z: -1
@ -756,7 +755,7 @@ Loader {
width: 60 * scaling width: 60 * scaling
height: 60 * scaling height: 60 * scaling
radius: width * 0.5 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.color: Color.mError
border.width: Math.max(1, Style.borderM * scaling) border.width: Math.max(1, Style.borderM * scaling)
@ -781,7 +780,7 @@ Loader {
width: 60 * scaling width: 60 * scaling
height: 60 * scaling height: 60 * scaling
radius: width * 0.5 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.color: Color.mPrimary
border.width: Math.max(1, Style.borderM * scaling) border.width: Math.max(1, Style.borderM * scaling)
@ -806,7 +805,7 @@ Loader {
width: 60 * scaling width: 60 * scaling
height: 60 * scaling height: 60 * scaling
radius: width * 0.5 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.color: Color.mSecondary
border.width: Math.max(1, Style.borderM * scaling) border.width: Math.max(1, Style.borderM * scaling)

2
Modules/Notification/Notification.qml
View file

@ -96,7 +96,7 @@ Variants {
height: Math.max(80 * scaling, contentRow.implicitHeight + (Style.marginL * 2 * scaling)) height: Math.max(80 * scaling, contentRow.implicitHeight + (Style.marginL * 2 * scaling))
clip: true clip: true
radius: Style.radiusL * scaling 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) border.width: Math.max(1, Style.borderS * scaling)
color: Color.mSurface color: Color.mSurface

10
Modules/PowerPanel/PowerPanel.qml
View file

@ -126,7 +126,7 @@ NPanel {
icon: timerActive ? "back_hand" : "close" icon: timerActive ? "back_hand" : "close"
tooltipText: timerActive ? "Cancel Timer" : "Close" tooltipText: timerActive ? "Cancel Timer" : "Close"
Layout.alignment: Qt.AlignVCenter 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 colorFg: timerActive ? Color.mError : Color.mOnSurface
onClicked: { onClicked: {
if (timerActive) { if (timerActive) {
@ -213,10 +213,12 @@ NPanel {
height: Style.baseWidgetSize * 1.6 * scaling height: Style.baseWidgetSize * 1.6 * scaling
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
color: { color: {
if (pending) if (pending) {
return Color.applyOpacity(Color.mPrimary, "20") return Qt.alpha(Color.mPrimary, 0.08)
if (mouseArea.containsMouse) }
if (mouseArea.containsMouse) {
return Color.mSecondary return Color.mSecondary
}
return Color.transparent return Color.transparent
} }

8
Modules/SettingsPanel/Extras/BarSectionEditor.qml
View file

@ -182,10 +182,10 @@ NBox {
sourceComponent: NIconButton { sourceComponent: NIconButton {
icon: "settings" icon: "settings"
sizeRatio: 0.6 sizeRatio: 0.6
colorBorder: Color.applyOpacity(Color.mOutline, "40") colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight)
colorBg: Color.mOnSurface colorBg: Color.mOnSurface
colorFg: Color.mOnPrimary colorFg: Color.mOnPrimary
colorBgHover: Color.applyOpacity(Color.mOnPrimary, "40") colorBgHover: Qt.alpha(Color.mOnPrimary, Style.opacityLight)
colorFgHover: Color.mOnPrimary colorFgHover: Color.mOnPrimary
onClicked: { onClicked: {
var dialog = Qt.createComponent("BarWidgetSettingsDialog.qml").createObject(root, { var dialog = Qt.createComponent("BarWidgetSettingsDialog.qml").createObject(root, {
@ -202,10 +202,10 @@ NBox {
NIconButton { NIconButton {
icon: "close" icon: "close"
sizeRatio: 0.6 sizeRatio: 0.6
colorBorder: Color.applyOpacity(Color.mOutline, "40") colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight)
colorBg: Color.mOnSurface colorBg: Color.mOnSurface
colorFg: Color.mOnPrimary colorFg: Color.mOnPrimary
colorBgHover: Color.applyOpacity(Color.mOnPrimary, "40") colorBgHover: Qt.alpha(Color.mOnPrimary, Style.opacityLight)
colorFgHover: Color.mOnPrimary colorFgHover: Color.mOnPrimary
onClicked: { onClicked: {
removeWidget(sectionId, index) removeWidget(sectionId, index)

4
Modules/SettingsPanel/Tabs/AudioTab.qml
View file

@ -316,8 +316,8 @@ ColumnLayout {
// Padding around the inner row // Padding around the inner row
property real pad: Style.marginS * scaling property real pad: Style.marginS * scaling
// Visuals // Visuals
color: Color.applyOpacity(Color.mOnSurface, "20") color: Qt.alpha(Color.mOnSurface, 0.125)
border.color: Color.applyOpacity(Color.mOnSurface, "50") border.color: Qt.alpha(Color.mOnSurface, Style.opacityLight)
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)
// Content // Content

4
Widgets/NPanel.qml
View file

@ -148,9 +148,7 @@ Loader {
visible: true visible: true
// Dim desktop if required // Dim desktop if required
color: (root.active && !root.isClosing && Settings.data.general.dimDesktop) ? Color.applyOpacity( color: (root.active && !root.isClosing && Settings.data.general.dimDesktop) ? Qt.alpha(Color.mShadow, Style.opacityHeavy) : Color.transparent
Color.mShadow,
"BB") : Color.transparent
WlrLayershell.exclusionMode: ExclusionMode.Ignore WlrLayershell.exclusionMode: ExclusionMode.Ignore
WlrLayershell.namespace: "noctalia-panel" WlrLayershell.namespace: "noctalia-panel"