[EGIT] [core/enlightenment] master 01/01: bat popup - match gadget content better

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=09e4f2f8b54622a0ef0b61156a43f66bd9eb8414

commit 09e4f2f8b54622a0ef0b61156a43f66bd9eb8414
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sun Mar 14 11:51:58 2021 +0000

    bat popup - match gadget content better
---
 src/modules/battery/e_mod_main.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 0ca065cf1..dda641aa6 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -230,18 +230,20 @@ _battery_popup_usage_content_update_cb(void *data)
 
         elm_progressbar_value_set(w->pb_usage, (double) bat->percent / 100.0);
 
-        if ((battery_config->have_power) && (!bat->charging))
-          elm_object_text_set(w->state, _("Charged"));
-        else if (bat->charging)
+        t = bat->time_left;
+        if ((battery_config->have_power) && (battery_config->full < 100))
           {
-             t = bat->time_full;
              elm_object_text_set(w->state, _("Charging"));
           }
-        else
+        else if ((!battery_config->have_power) && (battery_config->full < 100))
           {
-             t = bat->time_left;
              elm_object_text_set(w->state, _("Discharging"));
           }
+        else
+          {
+             t = 0;
+             elm_object_text_set(w->state, _("Charged"));
+          }
 
         hrs = (t / 3600);
         if (hrs < 0) hrs = 0;

--