for (i=0 ; i < nb_panel ; i++) {
if (battery_state.percentage >= percentage_hide) {
if (panel1[i].battery.area.on_screen == 1) {
- panel1[i].battery.area.on_screen = 0;
- panel1[i].area.resize = 1;
+ hide(&panel1[i].battery.area);
panel_refresh = 1;
}
}
else {
if (panel1[i].battery.area.on_screen == 0) {
- panel1[i].battery.area.on_screen = 1;
+ show(&panel1[i].battery.area);
+ panel_refresh = 1;
}
}
if (panel1[i].battery.area.on_screen == 1) {
}
g_free(path2);
}
- if (path_energy_now && path_energy_full) {
+
+ path_current_now = g_build_filename(battery_dir, "power_now", NULL);
+ if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
+ g_free(path_current_now);
path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+ }
+
+ if (path_energy_now && path_energy_full) {
path_status = g_build_filename(battery_dir, "status", NULL);
// check file
if (!battery_enabled)
return;
+ if (battery->area.bg == 0)
+ battery->area.bg = &g_array_index(backgrounds, Background, 0);
+
battery->area.parent = p;
battery->area.panel = p;
battery->area._draw_foreground = draw_battery;
battery->area.size_mode = SIZE_BY_CONTENT;
battery->area._resize = resize_battery;
- battery->area.resize = 1;
- battery->area.redraw = 1;
battery->area.on_screen = 1;
+ battery->area.resize = 1;
}
if (new_size > battery->area.width || new_size < (battery->area.width-2)) {
// we try to limit the number of resize
battery->area.width = new_size;
- battery->bat1_posy = ((battery->area.height - bat_percentage_height) / 2) - ((bat_time_height_ink + 2) / 2);
- battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2 - (bat_percentage_height - bat_percentage_height_ink)/2 - (bat_time_height - bat_time_height_ink)/2;
+ battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height)/2;
+ battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
ret = 1;
}
}
else {
int new_size = bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
- if (new_size != battery->area.height) {
+ if (new_size > battery->area.height || new_size < (battery->area.height-2)) {
battery->area.height = new_size;
- battery->bat1_posy = ((battery->area.height - bat_percentage_height) / 2) - ((bat_time_height_ink + 2) / 2);
- battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2 - (bat_percentage_height - bat_percentage_height_ink)/2 - (bat_time_height - bat_time_height_ink)/2;
+ battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2)/2;
+ battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
ret = 1;
}
}
-
return ret;
}