Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 21:45:38 -05:00
Code Packages Releases Activity

standardize some opacity colors

Browse Source
This commit is contained in:
bbedward
2025-07-25 18:19:22 -04:00
parent 1157b0336f
commit d28df49f18
37 changed files with 205 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/Notifications/NotificationPopup.qml
View File

@@ -338,12 +338,8 @@ PanelWindow {
buttonSize: 20
z: 15
onClicked: {
if (modelData.latestNotification.notification.transient) {
NotificationService.dismissGroup(modelData.key);
} else {
for (const notif of modelData.notifications) {
notif.popup = false;
}
for (const notif of modelData.notifications) {
notif.popup = false;
}
}
}
@@ -424,12 +420,8 @@ PanelWindow {
buttonSize: 20
z: 15
onClicked: {
if (modelData.latestNotification.notification.transient) {
NotificationService.dismissGroup(modelData.key);
} else {
for (const notif of modelData.notifications) {
notif.popup = false;
}
for (const notif of modelData.notifications) {
notif.popup = false;
}
}
}
@@ -667,12 +659,8 @@ PanelWindow {
}
onClicked: {
if (modelData.latestNotification.notification.transient) {
NotificationService.dismissGroup(modelData.key);
} else {
for (const notif of modelData.notifications) {
notif.popup = false;
}
for (const notif of modelData.notifications) {
notif.popup = false;
}
}
}

4
Modules/TopBar/Battery.qml
View File

@@ -14,7 +14,7 @@ Rectangle {
width: BatteryService.batteryAvailable ? 70 : 40
height: 30
radius: Theme.cornerRadius
color: batteryArea.containsMouse || batteryPopupVisible ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: batteryArea.containsMouse || batteryPopupVisible ? Theme.primaryPressed : Theme.secondaryHover
visible: true
Row {
@@ -99,7 +99,7 @@ Rectangle {
height: tooltipText.contentHeight + Theme.spacingS * 2
radius: Theme.cornerRadius
color: Theme.surfaceContainer
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.color: Theme.surfaceVariantAlpha
border.width: 1
visible: batteryArea.containsMouse && !batteryPopupVisible
anchors.bottom: parent.top

30
Modules/TopBar/BatteryPopout.qml
View File

@@ -95,7 +95,7 @@ PanelWindow {
sourceComponent: Rectangle {
color: Theme.popupBackground()
radius: Theme.cornerRadiusLarge
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.color: Theme.outlineMedium
border.width: 1
// Material 3 elevation with multiple layers
@@ -114,7 +114,7 @@ PanelWindow {
anchors.margins: -2
color: "transparent"
radius: parent.radius + 2
border.color: Qt.rgba(0, 0, 0, 0.08)
border.color: Theme.shadowMedium
border.width: 1
z: -2
}
@@ -122,7 +122,7 @@ PanelWindow {
Rectangle {
anchors.fill: parent
color: "transparent"
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.color: Theme.outlineStrong
border.width: 1
radius: parent.radius
z: -1
@@ -161,7 +161,7 @@ PanelWindow {
width: 32
height: 32
radius: 16
color: closeBatteryArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
color: closeBatteryArea.containsMouse ? Theme.errorHover : "transparent"
DankIcon {
anchors.centerIn: parent
@@ -188,7 +188,7 @@ PanelWindow {
height: 80
radius: Theme.cornerRadiusLarge
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.4)
border.color: BatteryService.isCharging ? Theme.primary : (BatteryService.isLowBattery ? Theme.error : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08))
border.color: BatteryService.isCharging ? Theme.primary : (BatteryService.isLowBattery ? Theme.error : Theme.outlineMedium)
border.width: BatteryService.isCharging || BatteryService.isLowBattery ? 2 : 1
visible: BatteryService.batteryAvailable
@@ -262,7 +262,7 @@ PanelWindow {
return "";
}
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.surfaceTextMedium
visible: text.length > 0
}
@@ -278,7 +278,7 @@ PanelWindow {
height: 80
radius: Theme.cornerRadiusLarge
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.4)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.color: Theme.outlineMedium
border.width: 1
visible: !BatteryService.batteryAvailable
@@ -307,7 +307,7 @@ PanelWindow {
Text {
text: "Power profile management is available"
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.surfaceTextMedium
}
}
@@ -341,7 +341,7 @@ PanelWindow {
Text {
text: "Health"
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.surfaceTextMedium
font.weight: Font.Medium
}
@@ -367,7 +367,7 @@ PanelWindow {
Text {
text: "Capacity"
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.surfaceTextMedium
font.weight: Font.Medium
}
@@ -407,8 +407,8 @@ PanelWindow {
width: parent.width
height: 50
radius: Theme.cornerRadiusLarge
color: profileArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : (root.isActiveProfile(modelData) ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1))
border.color: root.isActiveProfile(modelData) ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
color: profileArea.containsMouse ? Theme.primaryHoverLight : (root.isActiveProfile(modelData) ? Theme.primaryPressed : Theme.surfaceLight)
border.color: root.isActiveProfile(modelData) ? Theme.primary : Theme.outlineLight
border.width: root.isActiveProfile(modelData) ? 2 : 1
Row {
@@ -438,7 +438,7 @@ PanelWindow {
Text {
text: Theme.getPowerProfileDescription(modelData)
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.surfaceTextMedium
}
}
@@ -469,8 +469,8 @@ PanelWindow {
width: parent.width
height: 60
radius: Theme.cornerRadiusLarge
color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12)
border.color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.3)
color: Theme.errorHover
border.color: Theme.primarySelected
border.width: 1
visible: (typeof PowerProfiles !== "undefined") && PowerProfiles.degradationReason !== PerformanceDegradationReason.None

4
Modules/TopBar/Clock.qml
View File

@@ -13,7 +13,7 @@ Rectangle {
width: clockRow.implicitWidth + Theme.spacingS * 2
height: 30
radius: Theme.cornerRadius
color: clockMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: clockMouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceTextHover
Component.onCompleted: {
root.currentDate = systemClock.date;
}
@@ -35,7 +35,7 @@ Rectangle {
Text {
text: "•"
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: Theme.outlineButton
anchors.verticalCenter: parent.verticalCenter
visible: !compactMode
}

6
Modules/TopBar/ControlCenterButton.qml
View File

@@ -29,7 +29,7 @@ Rectangle {
width: Math.max(80, controlIndicators.implicitWidth + Theme.spacingS * 2)
height: 30
radius: Theme.cornerRadius
color: controlCenterArea.containsMouse || root.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: controlCenterArea.containsMouse || root.isActive ? Theme.primaryPressed : Theme.secondaryHover
Row {
id: controlIndicators
@@ -48,7 +48,7 @@ Rectangle {
return "wifi_off";
}
size: Theme.iconSize - 8
color: NetworkService.networkStatus !== "disconnected" ? Theme.primary : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
anchors.verticalCenter: parent.verticalCenter
visible: true
}
@@ -57,7 +57,7 @@ Rectangle {
DankIcon {
name: "bluetooth"
size: Theme.iconSize - 8
color: BluetoothService.enabled ? Theme.primary : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
anchors.verticalCenter: parent.verticalCenter
visible: BluetoothService.available && BluetoothService.enabled
}

2
Modules/TopBar/CpuMonitor.qml
View File

@@ -15,7 +15,7 @@ Rectangle {
width: 55
height: 30
radius: Theme.cornerRadius
color: cpuArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: cpuArea.containsMouse ? Theme.primaryPressed : Theme.secondaryHover
Component.onCompleted: {
SysMonitorService.addRef();
}

4
Modules/TopBar/FocusedApp.qml
View File

@@ -14,7 +14,7 @@ Rectangle {
width: compactMode ? Math.min(baseWidth, maxCompactWidth) : Math.min(baseWidth, maxNormalWidth)
height: 30
radius: Theme.cornerRadius
color: mouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: mouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceTextHover
clip: true
visible: FocusedWindowService.niriAvailable && (FocusedWindowService.focusedAppName || FocusedWindowService.focusedWindowTitle)
@@ -40,7 +40,7 @@ Rectangle {
Text {
text: "•"
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: Theme.outlineButton
anchors.verticalCenter: parent.verticalCenter
visible: appText.text && titleText.text
}

2
Modules/TopBar/LauncherButton.qml
View File

@@ -13,7 +13,7 @@ Rectangle {
width: 40
height: 30
radius: Theme.cornerRadius
color: launcherArea.containsMouse || isActive ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: launcherArea.containsMouse || isActive ? Theme.surfaceTextPressed : Theme.surfaceTextHover
SystemLogo {
visible: Prefs.useOSLogo

8
Modules/TopBar/Media.qml
View File

@@ -18,7 +18,7 @@ Rectangle {
height: 30
radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: Theme.surfaceTextHover
states: [
State {
name: "shown"
@@ -144,7 +144,7 @@ Rectangle {
height: 20
radius: 10
anchors.verticalCenter: parent.verticalCenter
color: prevArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
color: prevArea.containsMouse ? Theme.primaryHover : "transparent"
visible: root.playerAvailable
opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3
@@ -175,7 +175,7 @@ Rectangle {
height: 24
radius: 12
anchors.verticalCenter: parent.verticalCenter
color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
visible: root.playerAvailable
opacity: activePlayer ? 1 : 0.3
@@ -204,7 +204,7 @@ Rectangle {
height: 20
radius: 10
anchors.verticalCenter: parent.verticalCenter
color: nextArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
color: nextArea.containsMouse ? Theme.primaryHover : "transparent"
visible: playerAvailable
opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3

2
Modules/TopBar/NotificationCenterButton.qml
View File

@@ -13,7 +13,7 @@ Rectangle {
width: 40
height: 30
radius: Theme.cornerRadius
color: notificationArea.containsMouse || root.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: notificationArea.containsMouse || root.isActive ? Theme.primaryPressed : Theme.secondaryHover
DankIcon {
anchors.centerIn: parent

2
Modules/TopBar/RamMonitor.qml
View File

@@ -15,7 +15,7 @@ Rectangle {
width: 55
height: 30
radius: Theme.cornerRadius
color: ramArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: ramArea.containsMouse ? Theme.primaryPressed : Theme.secondaryHover
Component.onCompleted: {
SysMonitorService.addRef();
}

4
Modules/TopBar/SystemTrayBar.qml
View File

@@ -10,7 +10,7 @@ Rectangle {
width: Math.max(40, systemTrayRow.implicitWidth + Theme.spacingS * 2)
height: 30
radius: Theme.cornerRadius
color: Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: Theme.secondaryHover
visible: systemTrayRow.children.length > 0
Row {
@@ -43,7 +43,7 @@ Rectangle {
Rectangle {
anchors.fill: parent
radius: Theme.cornerRadiusSmall
color: trayItemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
Behavior on color {
enabled: trayItemArea.containsMouse !== undefined

6
Modules/TopBar/SystemTrayContextMenu.qml
View File

@@ -36,7 +36,7 @@ PanelWindow {
height: Math.max(60, menuList.contentHeight + Theme.spacingS * 2)
color: Theme.popupBackground()
radius: Theme.cornerRadiusLarge
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.color: Theme.outlineMedium
border.width: 1
// Material 3 animations
opacity: showContextMenu ? 1 : 0
@@ -98,7 +98,7 @@ PanelWindow {
width: ListView.view.width
height: modelData.isSeparator ? 5 : 28
radius: modelData.isSeparator ? 0 : Theme.cornerRadiusSmall
color: modelData.isSeparator ? "transparent" : (menuItemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent")
color: modelData.isSeparator ? "transparent" : (menuItemArea.containsMouse ? Theme.primaryHover : "transparent")
// Separator line
Rectangle {
@@ -106,7 +106,7 @@ PanelWindow {
anchors.centerIn: parent
width: parent.width - Theme.spacingS * 2
height: 1
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
color: Theme.surfaceVariantAlpha
}
// Menu item content

4
Modules/TopBar/TopBar.qml
View File

@@ -68,7 +68,7 @@ PanelWindow {
Rectangle {
anchors.fill: parent
color: "transparent"
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.color: Theme.outlineMedium
border.width: 1
radius: parent.radius
}
@@ -236,7 +236,7 @@ PanelWindow {
width: 40
height: 30
radius: Theme.cornerRadius
color: clipboardArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
color: clipboardArea.containsMouse ? Theme.primaryHover : Theme.secondaryHover
anchors.verticalCenter: parent.verticalCenter
visible: Prefs.showClipboard

2
Modules/TopBar/Weather.qml
View File

@@ -12,7 +12,7 @@ Rectangle {
width: visible ? Math.min(100, weatherRow.implicitWidth + Theme.spacingS * 2) : 0
height: 30
radius: Theme.cornerRadius
color: weatherArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: weatherArea.containsMouse ? Theme.primaryHover : Theme.surfaceTextHover
Ref {
service: WeatherService

6
Modules/TopBar/WorkspaceSwitcher.qml
View File

@@ -56,7 +56,7 @@ Rectangle {
width: Prefs.showWorkspacePadding ? Math.max(120, workspaceRow.implicitWidth + Theme.spacingL * 2) : workspaceRow.implicitWidth + Theme.spacingL * 2
height: 30
radius: Theme.cornerRadiusLarge
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
color: Theme.surfaceTextHover
visible: NiriService.niriAvailable
Connections {
@@ -108,7 +108,7 @@ Rectangle {
width: isActive ? Theme.spacingXL + Theme.spacingM : Theme.spacingL + Theme.spacingXS
height: Theme.spacingL
radius: height / 2
color: isActive ? Theme.primary : isPlaceholder ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06) : isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3)
color: isActive ? Theme.primary : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
MouseArea {
id: mouseArea
@@ -129,7 +129,7 @@ Rectangle {
visible: Prefs.showWorkspaceIndex
anchors.centerIn: parent
text: isPlaceholder ? sequentialNumber : sequentialNumber
color: isPlaceholder ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3) : Theme.surfaceText
color: isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceText
font.pixelSize: Theme.fontSizeMedium
font.bold: isActive && !isPlaceholder
}