quickshell: remove inner dropdown wrappers
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
b3a376cbb3
commit
c928cd3ca4
1 changed files with 30 additions and 95 deletions
|
|
@ -1273,7 +1273,7 @@ in
|
|||
width: dropdown.fullWidth
|
||||
height: dropdown.open ? dropdown.fullHeight : 0
|
||||
color: Theme.barBg
|
||||
radius: 10
|
||||
radius: 8
|
||||
topLeftRadius: 0
|
||||
topRightRadius: 0
|
||||
bottomRightRadius: dropdown.alignRight ? 0 : 8
|
||||
|
|
@ -1319,8 +1319,8 @@ in
|
|||
id: contextMenu
|
||||
alignRight: true
|
||||
property var trayItem: null
|
||||
fullWidth: ctxWrap.width + 8
|
||||
fullHeight: ctxWrap.height + 4
|
||||
fullWidth: menuItems.width + 24
|
||||
fullHeight: menuItems.height + 16
|
||||
|
||||
onVisibleChanged: {
|
||||
if (!visible) menuOpener.menu = null;
|
||||
|
|
@ -1330,17 +1330,6 @@ in
|
|||
id: menuOpener
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: ctxWrap
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
|
||||
|
||||
width: menuItems.width + 16
|
||||
height: menuItems.height + 12
|
||||
radius: 10
|
||||
color: Theme.base01
|
||||
|
||||
Column {
|
||||
id: menuItems
|
||||
anchors.centerIn: parent
|
||||
|
|
@ -1404,27 +1393,15 @@ in
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Volume dropdown
|
||||
BarDropdown {
|
||||
id: volDropdown
|
||||
alignRight: true
|
||||
fullWidth: volWrap.width + 8
|
||||
fullHeight: volWrap.height + 4
|
||||
fullWidth: volDropdownCol.width + 28
|
||||
fullHeight: volDropdownCol.height + 20
|
||||
autoCloseMs: 3000
|
||||
|
||||
Rectangle {
|
||||
id: volWrap
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
|
||||
|
||||
width: volDropdownCol.width + 20
|
||||
height: volDropdownCol.height + 16
|
||||
radius: 10
|
||||
color: Theme.base01
|
||||
|
||||
Column {
|
||||
id: volDropdownCol
|
||||
anchors.centerIn: parent
|
||||
|
|
@ -1449,7 +1426,7 @@ in
|
|||
width: parent.width - masterVolLabel.width - 8
|
||||
height: 20
|
||||
radius: 4
|
||||
color: Theme.base02
|
||||
color: Theme.base01
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
Rectangle {
|
||||
|
|
@ -1567,7 +1544,7 @@ in
|
|||
width: parent.width - appVolLabel.width - 8
|
||||
height: 16
|
||||
radius: 3
|
||||
color: Theme.base02
|
||||
color: Theme.base01
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
Rectangle {
|
||||
|
|
@ -1608,25 +1585,13 @@ in
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Network dropdown
|
||||
BarDropdown {
|
||||
id: netDropdown
|
||||
alignRight: true
|
||||
fullWidth: netWrap.width + 8
|
||||
fullHeight: netWrap.height + 4
|
||||
|
||||
Rectangle {
|
||||
id: netWrap
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
|
||||
|
||||
width: netDropdownCol.width + 20
|
||||
height: netDropdownCol.height + 16
|
||||
radius: 10
|
||||
color: Theme.base01
|
||||
fullWidth: netDropdownCol.width + 28
|
||||
fullHeight: netDropdownCol.height + 20
|
||||
|
||||
Column {
|
||||
id: netDropdownCol
|
||||
|
|
@ -1761,26 +1726,14 @@ in
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
${lib.optionalString isMacbook ''
|
||||
// Battery dropdown
|
||||
BarDropdown {
|
||||
id: batteryDropdown
|
||||
alignRight: true
|
||||
fullWidth: batWrap.width + 8
|
||||
fullHeight: batWrap.height + 4
|
||||
|
||||
Rectangle {
|
||||
id: batWrap
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
|
||||
|
||||
width: batteryDropdownCol.width + 20
|
||||
height: batteryDropdownCol.height + 16
|
||||
radius: 10
|
||||
color: Theme.base01
|
||||
fullWidth: batteryDropdownCol.width + 28
|
||||
fullHeight: batteryDropdownCol.height + 20
|
||||
|
||||
Column {
|
||||
id: batteryDropdownCol
|
||||
|
|
@ -1890,7 +1843,6 @@ in
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
''}
|
||||
|
||||
// Calendar popup
|
||||
|
|
@ -1912,21 +1864,6 @@ in
|
|||
NumberAnimation { duration: 150; easing.type: Easing.OutCubic }
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: 7 * 32 + 24
|
||||
height: calWrapCol.height + 16
|
||||
radius: 10
|
||||
|
||||
color: Theme.base01
|
||||
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
|
||||
|
|
@ -2091,7 +2028,7 @@ in
|
|||
width: 7 * 32 + 8
|
||||
height: notifCol.height + 12
|
||||
radius: 6
|
||||
color: Theme.base02
|
||||
color: Theme.base01
|
||||
|
||||
Column {
|
||||
id: notifCol
|
||||
|
|
@ -2133,9 +2070,9 @@ in
|
|||
width: actionText.width + 12
|
||||
height: actionText.height + 4
|
||||
radius: 4
|
||||
color: actionMa.containsMouse ? Theme.base03 : Theme.base02
|
||||
color: actionMa.containsMouse ? Theme.base02 : Theme.base01
|
||||
border.width: 1
|
||||
border.color: Theme.base03
|
||||
border.color: Theme.base02
|
||||
Text {
|
||||
id: actionText
|
||||
anchors.centerIn: parent
|
||||
|
|
@ -2179,8 +2116,6 @@ in
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue