#include "window.h"
#include "server.h"
-#include "area.h"
#include "panel.h"
-#include "taskbar.h"
#include "clock.h"
#include "timer.h"
#include "common.h"
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) {
}
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);
}
strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
// vertical panel doen't adjust width
- if (!panel_horizontal) return ret;
+ 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;
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
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);