X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=bd741c2bcd270c19904276d2237384a30b6cc638;hb=e7c43073246afe07cddf67d40d545f2bebcf62a1;hp=6e5032d24078e3d11932232841c2b834e6a618e3;hpb=35dc866951d48409e88a1fde5fdb52dfe60f3b18;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 6e5032d..bd741c2 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -149,6 +149,7 @@ 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;
@@ -224,11 +225,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 +238,7 @@ 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) return ret;
 
 	//printf("  resize_clock\n");
 	cairo_surface_t *cs;
@@ -273,11 +274,7 @@ 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;
@@ -287,6 +284,7 @@ void resize_clock (void *obj)
 	cairo_destroy (c);
 	cairo_surface_destroy (cs);
 	XFreePixmap (server.dsp, pmap);
+	return ret;
 }
 
 
@@ -301,6 +299,6 @@ void clock_action(int button)
 		command = clock_rclick_command;
 		break;
 	}
-  tint_exec(command);
+	tint_exec(command);
 }