styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

and accoutn for starting at -1! 

SVN revision: 37687
This commit is contained in:
Carsten Haitzler 2008-11-17 04:10:07 +00:00
parent d6c689e422
commit e5bc1dbf29
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/battery/e_mod_main.c
View File

@ -319,11 +319,12 @@ _battery_hal_update(void)
have_battery = 1;
batnum++;
if (hbat->is_charging) have_power = 1;
if (full == -1) full = 0;
if (hbat->last_full_charge > 0)
full += (hbat->current_charge * 100) / hbat->last_full_charge;
else if (hbat->design_charge > 0)
full += (hbat->current_charge * 100) / hbat->design_charge;
else
else if (hbat->percent >= 0)
full += hbat->percent;
if (hbat->time_left > 0)
{
@ -891,11 +892,13 @@ _battery_update(int full, int time_left, int have_battery, int have_power)
{
if (battery_config->full != full)
{
_battery_face_level_set(inst->o_battery,
(double)full / 100.0);
double val;
if (full >= 100) val = 1.0;
else val = (double)full / 100.0;
_battery_face_level_set(inst->o_battery, val);
if (inst->popup_battery)
_battery_face_level_set(inst->popup_battery,
(double)full / 100.0);
_battery_face_level_set(inst->popup_battery, val);
}
}
else