...

1 files changed, 39 insertions, 33 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml
index fd031627..da17df2a 100644
--- a/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml
+++ b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml
@@ -87,42 +87,48 @@ Item {
       hoverEnabled: true
       enabled: true
 
-      anchors.centerIn: parent
-
-      Text {
-        id: widgetTooltipText
-
-        font.pointSize: 10
-        font.family: "Fira Sans"
-        color: "white"
+      anchors.fill: parent
 
-        text: {
-          const stateStr = UPowerDeviceState.toString(root.batteryDevice.state);
-          var outStr = stateStr;
-          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged)
-            outStr += ` ${Math.round(root.batteryDevice.percentage * 100)}%`;
-
-          function formatTime(t) {
-            var res = "";
-            for (const unit of [{ "s": "h", "v": 3600 }, { "s": "m", "v": 60 }, { "s": "s", "v": 1 }]) {
-              if (t < unit.v)
-                continue;
-              res += Math.floor(t / unit.v) + unit.s;
-              t %= unit.v;
+      Item {
+        anchors.fill: parent
+
+        Text {
+          id: widgetTooltipText
+
+          anchors.centerIn: parent
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: "white"
+
+          text: {
+            const stateStr = UPowerDeviceState.toString(root.batteryDevice.state);
+            var outStr = stateStr;
+            if (root.batteryDevice.state != UPowerDeviceState.FullyCharged)
+              outStr += ` ${Math.round(root.batteryDevice.percentage * 100)}%`;
+
+            function formatTime(t) {
+              var res = "";
+              for (const unit of [{ "s": "h", "v": 3600 }, { "s": "m", "v": 60 }, { "s": "s", "v": 1 }]) {
+                if (t < unit.v)
+                  continue;
+                res += Math.floor(t / unit.v) + unit.s;
+                t %= unit.v;
+              }
+              return res;
+            }
+            if (root.batteryDevice.timeToEmpty != 0) {
+              const tStr = formatTime(Math.floor(root.batteryDevice.timeToEmpty / 60) * 60);
+              if (tStr)
+                outStr += " " + tStr;
+            } else if (root.batteryDevice.timeToFull != 0) {
+              const tStr = formatTime(Math.ceil(root.batteryDevice.timeToFull / 60) * 60);
+              if (tStr)
+                outStr += " " + tStr;
             }
-            return res;
-          }
-          if (root.batteryDevice.timeToEmpty != 0) {
-            const tStr = formatTime(Math.floor(root.batteryDevice.timeToEmpty / 60) * 60);
-            if (tStr)
-              outStr += " " + tStr;
-          } else if (root.batteryDevice.timeToFull != 0) {
-            const tStr = formatTime(Math.ceil(root.batteryDevice.timeToFull / 60) * 60);
-            if (tStr)
-              outStr += " " + tStr;
-          }
 
-          return outStr;
+            return outStr;
+          }
         }
       }
     }