From b14e70c2e9a0bdd9c94eecd495de7a04614e904a Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:56:19 +0100
Subject: [PATCH] fix battery widget

---
 src/overlays/watch.rs | 4 ++--
 src/res/watch.yaml    | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/overlays/watch.rs b/src/overlays/watch.rs
index f098a57..6bfa480 100644
--- a/src/overlays/watch.rs
+++ b/src/overlays/watch.rs
@@ -164,7 +164,7 @@ where
                 canvas.fg_color = color_parse(&normal_fg_color).unwrap_or(FALLBACK_COLOR);
 
                 for i in 0..num_devices {
-                    let label = canvas.label(
+                    let label = canvas.label_centered(
                         button_x + 2.,
                         button_y + 2.,
                         button_w - 4.,
@@ -322,7 +322,7 @@ fn battery_update(control: &mut Control<(), ElemState>, _: &mut (), app: &mut Ap
     let text = match device {
         Some(d) => d
             .soc
-            .map(|soc| format!("{}{}", tags[d.role as usize], soc as u32))
+            .map(|soc| format!("{}{}", tags[d.role as usize], (soc * 100.) as u32))
             .unwrap_or_else(|| "".into()),
         None => "".into(),
     };
diff --git a/src/res/watch.yaml b/src/res/watch.yaml
index ed87dc9..521e4f9 100644
--- a/src/res/watch.yaml
+++ b/src/res/watch.yaml
@@ -96,17 +96,18 @@ watch_elements:
     text: "Chicago" # change TZ2 label here
 
   - type: Batteries
-    rect: [0, 20, 400, 40]
+    rect: [0, 0, 400, 40]
     font_size: 14
     num_devices: 9
     low_threshold: 15
-    normal_fg_color: "#406040"
+    layout: Horizontal
+    normal_fg_color: "#99BBAA"
+    # below is not yet implemented
     normal_bg_color: "#353535"
     low_fg_color: "#604040"
     low_bg_color: "#353535"
     charging_fg_color: "#204070"
     charging_bg_color: "#353535"
-    layout: Horizontal
 
   # sample
   # - type: ExecLabel