From: Andreas Fink <andreas.fink85@googlemail.com>
Date: Sat, 8 Jan 2011 13:56:26 +0000 (+0000)
Subject: *fix* issue 319
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=5ba60d0bf84eeb901ac0eaeb376e00f116b75c28;p=chaz%2Ftint2

*fix* issue 319
---

diff --git a/src/battery/battery.c b/src/battery/battery.c
index faf27e9..04c9934 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -460,8 +460,8 @@ int resize_battery(void *obj)
 		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;
 		}
 	}
@@ -469,8 +469,8 @@ int resize_battery(void *obj)
 		int new_size = bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
 		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;
 		}
 	}
diff --git a/src/clock/clock.c b/src/clock/clock.c
index 38cfcde..ec17a9f 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -221,8 +221,8 @@ int resize_clock (void *obj)
 			clock->area.width = new_size + 1;
 			clock->time1_posy = (clock->area.height - time_height) / 2;
 			if (time2_format) {
-				clock->time1_posy -= ((date_height_ink + 2) / 2);
-				clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+				clock->time1_posy -= (date_height)/2;
+				clock->time2_posy = clock->time1_posy + time_height;
 			}
 			ret = 1;
 		}
@@ -234,8 +234,8 @@ int resize_clock (void *obj)
 			clock->area.height =  new_size;
 			clock->time1_posy = (clock->area.height - time_height) / 2;
 			if (time2_format) {
-				clock->time1_posy -= ((date_height_ink + 2) / 2);
-				clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+				clock->time1_posy -= (date_height)/2;
+				clock->time2_posy = clock->time1_posy + time_height;
 			}
 			ret = 1;
 		}