1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00

battery: use native UPower service

This commit is contained in:
bbedward
2025-07-15 15:57:12 -04:00
parent b10488c505
commit 90999e8ac1
4 changed files with 111 additions and 202 deletions

View File

@@ -7,6 +7,8 @@ Rectangle {
property bool batteryPopupVisible: false
signal toggleBatteryPopup()
width: 70 // Increased width to accommodate percentage text
height: 30
radius: Theme.cornerRadius
@@ -63,7 +65,7 @@ Rectangle {
cursorShape: Qt.PointingHandCursor
onClicked: {
batteryPopupVisible = !batteryPopupVisible
toggleBatteryPopup()
}
}

View File

@@ -78,14 +78,14 @@ Rectangle {
}
Column {
anchors.centerIn: parent
width: parent.width - theme.spacingM * 2
spacing: theme.spacingM
anchors.fill: parent
anchors.margins: theme.spacingS
spacing: theme.spacingS
// Show different content based on whether we have active media
Item {
width: parent.width
height: 80
height: 60
// Placeholder when no media
Column {
@@ -117,8 +117,8 @@ Rectangle {
// Album Art
Rectangle {
width: 80
height: 80
width: 60
height: 60
radius: theme.cornerRadius
color: Qt.rgba(theme.surfaceVariant.r, theme.surfaceVariant.g, theme.surfaceVariant.b, 0.3)
@@ -152,7 +152,7 @@ Rectangle {
// Track Info
Column {
width: parent.width - 80 - theme.spacingM
width: parent.width - 60 - theme.spacingM
spacing: theme.spacingXS
anchors.verticalCenter: parent.verticalCenter
@@ -189,7 +189,7 @@ Rectangle {
Item {
id: progressBarContainer
width: parent.width
height: 32
height: 24
Rectangle {
id: progressBarBackground
@@ -305,8 +305,9 @@ Rectangle {
// Control buttons - always visible
Row {
anchors.horizontalCenter: parent.horizontalCenter
spacing: theme.spacingL
spacing: theme.spacingM
visible: activePlayer !== null
height: 32
// Previous button
Rectangle {
@@ -344,9 +345,9 @@ Rectangle {
// Play/Pause button
Rectangle {
width: 36
height: 36
radius: 18
width: 32
height: 32
radius: 16
color: theme.primary
Text {

View File

@@ -315,6 +315,10 @@ PanelWindow {
// Battery Widget
BatteryWidget {
anchors.verticalCenter: parent.verticalCenter
batteryPopupVisible: topBar.shellRoot.batteryPopupVisible
onToggleBatteryPopup: {
topBar.shellRoot.batteryPopupVisible = !topBar.shellRoot.batteryPopupVisible
}
}
ControlCenterButton {