X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=0514a51f27ff46b77e0d79a73664a74e090a109b;hb=bbec33ce1a15b555a737f2fefe7bdfb6a8881705;hp=8fd6aa03deb0fb654b0cd5687d197972218b4fba;hpb=7a03bbf353324d6803aa84ca8fd41e6c6f4d099c;p=chaz%2Ftint2

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 8fd6aa0..0514a51 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -73,17 +73,19 @@ void update_batterys(void* arg)
 		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;
 				panel_refresh = 1;
 			}
-			continue;
 		}
 		else {
 			if (panel1[i].battery.area.on_screen == 0) {
 				panel1[i].battery.area.on_screen = 1;
-				panel_refresh = 1;
 			}
 		}
-		panel1[i].battery.area.resize = 1;
+		if (panel1[i].battery.area.on_screen == 1) {
+			panel1[i].battery.area.resize = 1;
+			panel_refresh = 1;
+		}
 	}
 }
 
@@ -235,15 +237,14 @@ void init_battery_panel(void *p)
 
 	get_text_size(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, panel->area.height, buf_bat_percentage, strlen(buf_bat_percentage));
 	get_text_size(bat2_font_desc, &bat_time_height_ink, &bat_time_height, panel->area.height, buf_bat_time, strlen(buf_bat_time));
+	
 
 	if (panel_horizontal) {
-		// panel horizonal => fixed height and posy
-		battery->area.posy = panel->area.bg->border.width + panel->area.paddingy;
+		// panel horizonal => fixed height
 		battery->area.height = panel->area.height - (2 * battery->area.posy);
 	}
 	else {
-		// panel vertical => fixed width, height, posy and posx
-		battery->area.posx = panel->area.bg->border.width + panel->area.paddingy;
+		// panel vertical => fixed width, height
 		battery->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
 	}
 
@@ -448,7 +449,6 @@ int resize_battery(void *obj)
 
 	percentage_width = time_width = 0;
 	battery->area.redraw = 1;
-
 	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
 	if(battery_state.state == BATTERY_FULL) {
 		strcpy(buf_bat_time, "Full");