X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=10778d4ee2d467adbb4a9e2999f41a7ec763ef47;hb=3ad3e76e075ac8c26668c6ae967758f397855aad;hp=a3061cb206919800ae04c1d4b0eb38c8e24b66d7;hpb=11c177f708dc4f9cb0762050e3e376ced0272fd7;p=chaz%2Ftint2 diff --git a/src/clock/clock.c b/src/clock/clock.c index a3061cb..10778d4 100644 --- a/src/clock/clock.c +++ b/src/clock/clock.c @@ -60,6 +60,13 @@ void init_clock() Clock *clock; int i, time_height, time_height_ink, date_height, date_height_ink; + init_precision(); + // update clock to force update (-time_precision) + struct timeval stv; + gettimeofday(&stv, 0); + time_clock.tv_sec = stv.tv_sec - time_precision; + time_clock.tv_sec -= time_clock.tv_sec % time_precision; + for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; clock = &panel->clock; @@ -68,13 +75,6 @@ void init_clock() clock->area.panel = panel; clock->area._draw_foreground = draw_clock; clock->area._resize = resize_clock; - init_precision(); - - // update clock to force update (-time_precision) - struct timeval stv; - gettimeofday(&stv, 0); - time_clock.tv_sec = stv.tv_sec - time_precision; - time_clock.tv_sec -= time_clock.tv_sec % time_precision; if (!clock->area.on_screen) continue; @@ -175,7 +175,6 @@ void resize_clock (void *obj) new_width += (2*clock->area.paddingxlr) + (2*clock->area.pix.border.width); if (new_width > clock->area.width || new_width < (clock->area.width-6)) { - int i; Panel *panel = ((Area*)obj)->panel; printf("clock_width %d, new_width %d\n", clock->area.width, new_width); @@ -185,9 +184,10 @@ void resize_clock (void *obj) clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width; // resize other objects on panel - for (i=0 ; i < nb_panel ; i++) { - panel1[i].area.resize = 1; - } + panel->area.resize = 1; +#ifdef ENABLE_BATTERY + panel->battery.area.resize = 1; +#endif systray.area.resize = 1; panel_refresh = 1; }