X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=70babb66ab75e9315d36965de06d14e6480088e9;hb=9daa525aab5dfb62788865e4cbe4d92ddf055e93;hp=af7afe1e236740df361bb1790c07e31edee7d92a;hpb=5b512dac5fd1ac69cbd15e995442391cc0a984fc;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index af7afe1..70babb6 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -26,9 +26,7 @@
 
 #include "window.h"
 #include "server.h"
-#include "area.h"
 #include "panel.h"
-#include "taskbar.h"
 #include "clock.h"
 #include "timer.h"
 #include "common.h"
@@ -149,11 +147,15 @@ void init_clock_panel(void *p)
 	clock->area.parent = p;
 	clock->area.panel = p;
 	clock->area._draw_foreground = draw_clock;
+	clock->area.size_mode = SIZE_BY_CONTENT;
 	clock->area._resize = resize_clock;
 	clock->area.resize = 1;
 	clock->area.redraw = 1;
-	clock->area.on_screen = 1;
+	// check consistency
+	if (time1_format == 0)
+		return;
 
+	clock->area.on_screen = 1;
 	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
 	get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
 	if (time2_format) {
@@ -168,8 +170,6 @@ void init_clock_panel(void *p)
 	}
 	else {
 		// panel vertical => fixed width, height, posy and posx
-		clock->area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
-		clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
 		clock->area.posx = panel->area.bg->border.width + panel->area.paddingy;
 		clock->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
 	}
@@ -224,11 +224,11 @@ void draw_clock (void *obj, cairo_t *c)
 }
 
 
-void resize_clock (void *obj)
+int resize_clock (void *obj)
 {
 	Clock *clock = obj;
 	PangoLayout *layout;
-	int time_width, date_width, new_width;
+	int time_width, date_width, new_width, ret = 0;
 
 	clock->area.redraw = 1;
 	time_width = date_width = 0;
@@ -237,7 +237,11 @@ void resize_clock (void *obj)
 		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
 
 	// vertical panel doen't adjust width
-	if (!panel_horizontal) return;
+	if (!panel_horizontal) {
+//		clock->area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
+//		clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
+		return ret;
+	}
 
 	//printf("  resize_clock\n");
 	cairo_surface_t *cs;
@@ -265,7 +269,6 @@ void resize_clock (void *obj)
 	else new_width = date_width;
 	new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 
-	Panel *panel = ((Area*)obj)->panel;
 	if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
 		// resize clock
 		// we try to limit the number of resize
@@ -273,20 +276,15 @@ void resize_clock (void *obj)
 		clock->area.width = new_width + 1;
 
 		// resize other objects on panel
-		panel->area.resize = 1;
-#ifdef ENABLE_BATTERY
-		panel->battery.area.resize = 1;
-#endif
-		systray.area.resize = 1;
+		ret = 1;
 		panel_refresh = 1;
 	}
-	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
-
 
 	g_object_unref (layout);
 	cairo_destroy (c);
 	cairo_surface_destroy (cs);
 	XFreePixmap (server.dsp, pmap);
+	return ret;
 }