From 10f50cf29bc6f3eab13a3b50671ea5fb272eade7 Mon Sep 17 00:00:00 2001 From: "Andreas.Fink85" Date: Sat, 8 Jan 2011 13:56:26 +0000 Subject: [PATCH] *fix* issue 319 git-svn-id: http://tint2.googlecode.com/svn/trunk@621 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/battery/battery.c | 8 ++++---- src/clock/clock.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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; }