fixed some bugs

[chaz/tint2] / src / clock / clock.c

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 19aaf4ac4a82e8fc907d8798f5fb4b96c7f64b48..288ed942e601181bdb2792fe7fe9f7889c4ea32f 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -53,11 +53,11 @@ void init_clock()
 
                clock->area.parent = panel;
                clock->area.panel = panel;
-               if (!clock->area.visible) return;
-
-               clock->area._draw_foreground = draw_foreground_clock;
+               clock->area._draw_foreground = draw_clock;
                clock->area._resize = resize_clock;
 
+               if (!clock->area.on_screen) continue;
+
                if (strchr(time1_format, 'S') == NULL) time_precision = 60;
                else time_precision = 1;
 
@@ -89,12 +89,12 @@ void init_clock()
 }
 
 
-void draw_foreground_clock (void *obj, cairo_t *c, int active)
+void draw_clock (void *obj, cairo_t *c, int active)
 {
    Clock *clock = obj;
    PangoLayout *layout;
 
-   //printf("  draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
+   //printf("  draw_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
    layout = pango_cairo_create_layout (c);
 
    // draw layout
@@ -163,19 +163,21 @@ void resize_clock (void *obj)
    else new_width = date_width;
    new_width += (2*clock->area.paddingxlr) + (2*clock->area.pix.border.width);
 
-   if (new_width > clock->area.width || new_width < (clock->area.width-3)) {
+   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);
+      printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
       // resize clock
-      clock->area.width = new_width;
+      // we try to limit the number of resize
+      clock->area.width = new_width + 1;
       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;
                }
+               systray.area.resize = 1;
                panel_refresh = 1;
    }