zach/z-bar-qt
1
1
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

color feedback on open popouts #40

Merged
zach merged 1 commits from dark-mode-schedule into main 2026-03-26 19:30:42 +01:00
Conversation 0 Commits 1 Files Changed 5
+36 -27
5 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ee804e849 - Show all commits
Modules/Clock.qml
+2 -2
View File
@@ -13,7 +13,7 @@ CustomRect {
required property Wrapper popouts
required property PersistentProperties visibilities
color: DynamicColors.tPalette.m3surfaceContainer
color: visibilities.dashboard ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
implicitWidth: timeText.contentWidth + Appearance.padding.normal * 2
radius: Appearance.rounding.full
@@ -22,7 +22,7 @@ CustomRect {
id: timeText
anchors.centerIn: parent
color: DynamicColors.palette.m3onSurface
color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
text: Time.dateStr
Behavior on color {
Modules/NotifBell.qml
+2 -4
View File
@@ -11,7 +11,7 @@ CustomRect {
required property Wrapper popouts
required property PersistentProperties visibilities
color: DynamicColors.tPalette.m3surfaceContainer
color: visibilities.sidebar ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
implicitWidth: implicitHeight
radius: Appearance.rounding.full
@@ -19,10 +19,8 @@ CustomRect {
MaterialIcon {
id: notificationCenterIcon
property color iconColor: DynamicColors.palette.m3onSurface
anchors.centerIn: parent
color: iconColor
color: root.visibilities.sidebar ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
font.family: "Material Symbols Rounded"
font.pointSize: Appearance.font.size.larger
text: HasNotifications.hasNotifications ? "\uf4fe" : "\ue7f4"
Modules/Resource.qml
+2 -1
View File
@@ -12,6 +12,7 @@ RowLayout {
readonly property real arcStartAngle: 0.75 * Math.PI
readonly property real arcSweep: 1.5 * Math.PI
property string icon
required property color iconColor
required property color mainColor
required property double percentage
property bool shown: true
@@ -37,7 +38,7 @@ RowLayout {
MaterialIcon {
id: icon
color: DynamicColors.palette.m3onSurface
color: root.iconColor
font.pointSize: Appearance.font.size.larger
text: root.icon
}
Modules/Resources.qml
+9 -5
View File
@@ -14,7 +14,7 @@ CustomRect {
required property PersistentProperties visibilities
clip: true
color: DynamicColors.tPalette.m3surfaceContainer
color: visibilities.resources ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
implicitWidth: rowLayout.implicitWidth + Appearance.padding.normal * 2
radius: height / 2
@@ -38,7 +38,8 @@ CustomRect {
Layout.alignment: Qt.AlignVCenter
Layout.fillHeight: true
icon: "memory"
mainColor: DynamicColors.palette.m3primary
iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
mainColor: root.visibilities.resources ? DynamicColors.palette.m3primaryContainer : DynamicColors.palette.m3primary
percentage: SystemUsage.cpuPerc
warningThreshold: 95
}
@@ -46,7 +47,8 @@ CustomRect {
Resource {
Layout.fillHeight: true
icon: "memory_alt"
mainColor: DynamicColors.palette.m3secondary
iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
mainColor: root.visibilities.resources ? DynamicColors.palette.m3secondaryContainer : DynamicColors.palette.m3secondary
percentage: SystemUsage.memPerc
warningThreshold: 80
}
@@ -54,14 +56,16 @@ CustomRect {
Resource {
Layout.fillHeight: true
icon: "gamepad"
mainColor: DynamicColors.palette.m3tertiary
iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
mainColor: root.visibilities.resources ? DynamicColors.palette.m3tertiaryContainer : DynamicColors.palette.m3tertiary
percentage: SystemUsage.gpuPerc
}
Resource {
Layout.fillHeight: true
icon: "developer_board"
mainColor: DynamicColors.palette.m3primary
iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
mainColor: root.visibilities.resources ? DynamicColors.palette.m3primaryContainer : DynamicColors.palette.m3primary
percentage: SystemUsage.gpuMemUsed
}
}
Modules/TrayItem.qml
+21 -15
View File
@@ -9,29 +9,35 @@ import qs.Config
Item {
id: root
property bool current: popouts.currentName.startsWith(`traymenu${ind}`) && popouts.hasCurrent
property bool hasLoaded: false
required property int ind
required property SystemTrayItem item
required property RowLayout loader
required property Wrapper popouts
StateLayer {
acceptedButtons: Qt.LeftButton | Qt.RightButton
CustomRect {
anchors.fill: parent
anchors.margins: 3
radius: 6
color: root.current ? DynamicColors.palette.m3primary : "transparent"
radius: Appearance.rounding.full
onClicked: {
if (mouse.button === Qt.LeftButton) {
root.item.activate();
} else if (mouse.button === Qt.RightButton) {
root.popouts.currentName = `traymenu${root.ind}`;
root.popouts.currentCenter = Qt.binding(() => root.mapToItem(root.loader, root.implicitWidth / 2, 0).x);
root.popouts.hasCurrent = true;
if (visibilities.sidebar || visibilities.dashboard || visibilities.settings) {
visibilities.sidebar = false;
visibilities.dashboard = false;
visibilities.settings = false;
StateLayer {
acceptedButtons: Qt.LeftButton | Qt.RightButton
anchors.fill: parent
onClicked: {
if (mouse.button === Qt.LeftButton) {
root.item.activate();
} else if (mouse.button === Qt.RightButton) {
root.popouts.currentName = `traymenu${root.ind}`;
root.popouts.currentCenter = Qt.binding(() => root.mapToItem(root.loader, root.implicitWidth / 2, 0).x);
root.popouts.hasCurrent = true;
if (visibilities.sidebar || visibilities.dashboard || visibilities.settings) {
visibilities.sidebar = false;
visibilities.dashboard = false;
visibilities.settings = false;
}
}
}
}
@@ -41,7 +47,7 @@ Item {
id: icon
anchors.centerIn: parent
color: DynamicColors.palette.m3onSurface
color: root.current ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
implicitSize: 22
layer.enabled: Config.general.color.smart || Config.general.color.scheduleDark
source: root.item.icon