From 0e63e698f26a3c8afc22a8f0708a6c3895a46944 Mon Sep 17 00:00:00 2001
From: EinBowser <146022965+EinBowser@users.noreply.github.com>
Date: Sat, 1 Nov 2025 23:26:36 +0100
Subject: [PATCH] Wrong position and forgot an import

---
 .../ii/modules/bar/BatteryPopup.qml           | 43 ++++++++++---------
 .../quickshell/ii/services/Battery.qml        |  1 +
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/dots/.config/quickshell/ii/modules/bar/BatteryPopup.qml b/dots/.config/quickshell/ii/modules/bar/BatteryPopup.qml
index 72523393d..bba4c422c 100644
--- a/dots/.config/quickshell/ii/modules/bar/BatteryPopup.qml
+++ b/dots/.config/quickshell/ii/modules/bar/BatteryPopup.qml
@@ -63,7 +63,28 @@ StyledPopup {
                 text: Battery.isCharging ? Translation.tr("Time to full:") : Translation.tr("Time to empty:")
                 color: Appearance.colors.colOnSurfaceVariant
             }
-            RowLayout {
+            StyledText {
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignRight
+                color: Appearance.colors.colOnSurfaceVariant
+                text: {
+                    function formatTime(seconds) {
+                        var h = Math.floor(seconds / 3600);
+                        var m = Math.floor((seconds % 3600) / 60);
+                        if (h > 0)
+                            return `${h}h, ${m}m`;
+                        else
+                            return `${m}m`;
+                    }
+                    if (Battery.isCharging)
+                        return formatTime(Battery.timeToFull);
+                    else
+                        return formatTime(Battery.timeToEmpty);
+                }
+            }
+        }
+
+        RowLayout {
                 spacing: 5
                 visible: Config.options.battery.showHealth
                 Layout.fillWidth: true
@@ -86,26 +107,6 @@ StyledPopup {
                     text: `${(Battery.health).toFixed(1)}%`
                 }
             }
-            StyledText {
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignRight
-                color: Appearance.colors.colOnSurfaceVariant
-                text: {
-                    function formatTime(seconds) {
-                        var h = Math.floor(seconds / 3600);
-                        var m = Math.floor((seconds % 3600) / 60);
-                        if (h > 0)
-                            return `${h}h, ${m}m`;
-                        else
-                            return `${m}m`;
-                    }
-                    if (Battery.isCharging)
-                        return formatTime(Battery.timeToFull);
-                    else
-                        return formatTime(Battery.timeToEmpty);
-                }
-            }
-        }
 
         RowLayout {
             spacing: 5
diff --git a/dots/.config/quickshell/ii/services/Battery.qml b/dots/.config/quickshell/ii/services/Battery.qml
index caa0ab9fe..a3f45ac77 100644
--- a/dots/.config/quickshell/ii/services/Battery.qml
+++ b/dots/.config/quickshell/ii/services/Battery.qml
@@ -6,6 +6,7 @@ import Quickshell
 import Quickshell.Services.UPower
 import QtQuick
 import Quickshell.Io
+import qs.modules.common.functions
 
 Singleton {
     id: root