quickshell: wrap calendar+notifications in parent container

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
rope 2026-05-27 11:26:34 +01:00
parent 6e69f86f17
commit 179b44d319

View file

@ -1873,12 +1873,26 @@ in
} }
Rectangle { Rectangle {
width: 7 * 32 + 16 width: 7 * 32 + 24
height: calTitle.height + 16 height: calWrapCol.height + 16
radius: 8 radius: 10
color: Theme.base01 color: Theme.base01
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Column {
id: calWrapCol
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: 8
spacing: 8
Rectangle {
width: 7 * 32 + 8
height: calTitle.height + 12
radius: 8
color: Theme.base02
anchors.horizontalCenter: parent.horizontalCenter
Text { Text {
id: calTitle id: calTitle
anchors.centerIn: parent anchors.centerIn: parent
@ -1891,10 +1905,10 @@ in
} }
Rectangle { Rectangle {
width: 7 * 32 + 16 width: 7 * 32 + 8
height: calInner.height + 16 height: calInner.height + 12
radius: 8 radius: 8
color: Theme.base01 color: Theme.base02
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Column { Column {
@ -1906,7 +1920,7 @@ in
width: 7 * 32 width: 7 * 32
height: weekdayRow.height + 8 height: weekdayRow.height + 8
radius: 6 radius: 6
color: Theme.base02 color: Theme.base03
Row { Row {
id: weekdayRow id: weekdayRow
@ -1919,7 +1933,7 @@ in
width: 32 width: 32
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: modelData text: modelData
color: Theme.base03 color: Theme.base00
font.family: "FiraMono Nerd Font" font.family: "FiraMono Nerd Font"
font.pixelSize: 13 font.pixelSize: 13
} }
@ -1947,7 +1961,7 @@ in
let dayNum = index - startDay + 1; let dayNum = index - startDay + 1;
let daysInMonth = new Date(d.getFullYear(), d.getMonth() + 1, 0).getDate(); let daysInMonth = new Date(d.getFullYear(), d.getMonth() + 1, 0).getDate();
return (dayNum === d.getDate() && dayNum >= 1 && dayNum <= daysInMonth) return (dayNum === d.getDate() && dayNum >= 1 && dayNum <= daysInMonth)
? Theme.base02 : "transparent"; ? Theme.base03 : "transparent";
} }
Text { Text {
@ -1977,13 +1991,15 @@ in
} }
Rectangle { Rectangle {
width: 7 * 32 + 16 width: 7 * 32 + 8
height: 1 height: 1
color: Theme.base02 color: Theme.base02
anchors.horizontalCenter: parent.horizontalCenter
} }
Row { Row {
width: 7 * 32 + 16 width: 7 * 32 + 8
anchors.horizontalCenter: parent.horizontalCenter
Text { Text {
text: "Notifications" text: "Notifications"
color: Theme.base05 color: Theme.base05
@ -2013,7 +2029,8 @@ in
Column { Column {
spacing: 4 spacing: 4
width: 7 * 32 + 16 width: 7 * 32 + 8
anchors.horizontalCenter: parent.horizontalCenter
Text { Text {
visible: bar.notifServer.trackedNotifications.values.length === 0 visible: bar.notifServer.trackedNotifications.values.length === 0
@ -2030,10 +2047,10 @@ in
Rectangle { Rectangle {
id: notifItem id: notifItem
required property var modelData required property var modelData
width: 7 * 32 + 16 width: 7 * 32 + 8
height: notifCol.height + 12 height: notifCol.height + 12
radius: 6 radius: 6
color: Theme.base01 color: Theme.base02
Column { Column {
id: notifCol id: notifCol
@ -2075,9 +2092,9 @@ in
width: actionText.width + 12 width: actionText.width + 12
height: actionText.height + 4 height: actionText.height + 4
radius: 4 radius: 4
color: actionMa.containsMouse ? Theme.base02 : Theme.base01 color: actionMa.containsMouse ? Theme.base03 : Theme.base02
border.width: 1 border.width: 1
border.color: Theme.base02 border.color: Theme.base03
Text { Text {
id: actionText id: actionText
anchors.centerIn: parent anchors.centerIn: parent
@ -2121,6 +2138,8 @@ in
} }
} }
} }
}
}
''; '';
}; };