M bar/modules/Battery.qml → bar/modules/Battery.qml

@@ -11,21 +11,10 @@ Repeater {
   model: UPower.devices.values.filter(d=>d.model)
   RowLayout {
     spacing: 2
-    layoutDirection: Qt.RightToLeft
     property var lvl: Math.round(modelData.percentage*100)
     property var charge_state: UPowerDeviceState.toString(modelData.state)
     property var device_type: UPowerDeviceType.toString(modelData.type)
-    Class.TopbarText {
-      id: battery_level_indicator
-      text: lvl+"%"
-      font.family: font_proggy.name
-      color:
-        (charge_state == "Charging")
-        ? Resources.palette.saffron
-        : (lvl < 20)
-          ? Resources.palette.scarlet
-          : Resources.palette.fg
-    }
+    Class.Sep{}
      Text {
        id: battery_device_icon
        font.family: font_icon.name
@@ -60,6 +49,16 @@ : (charge_state == "FullyCharged")
               ? Resources.palette.cyan
               : Resources.palette.orange
     }
-    Class.Sep{}
+    Class.TopbarText {
+      id: battery_level_indicator
+      text: lvl+"%"
+      font.family: font_proggy.name
+      color:
+        (charge_state == "Charging")
+        ? Resources.palette.saffron
+        : (lvl < 20)
+          ? Resources.palette.scarlet
+          : Resources.palette.fg
+    }
   }
 }