- Clock *clock = obj;
- PangoLayout *layout;
- int time_width, date_width, new_width;
-
- time_width = date_width = 0;
- clock->area.redraw = 1;
-
- strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
- if (time2_format)
- strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
-
- //printf(" resize_clock\n");
- cairo_surface_t *cs;
- cairo_t *c;
- Pixmap pmap;
- pmap = XCreatePixmap (server.dsp, server.root_win, clock->area.width, clock->area.height, server.depth);
-
- cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, clock->area.width, clock->area.height);
- c = cairo_create (cs);
- layout = pango_cairo_create_layout (c);
-
- // check width
- pango_layout_set_font_description (layout, time1_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text (layout, buf_time, strlen(buf_time));
- pango_layout_get_pixel_size (layout, &time_width, NULL);
- if (time2_format) {
- pango_layout_set_font_description (layout, time2_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text (layout, buf_date, strlen(buf_date));
- pango_layout_get_pixel_size (layout, &date_width, NULL);
- }
-
- if (time_width > date_width) new_width = time_width;
- 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-6)) {
- int i;
- Panel *panel = ((Area*)obj)->panel;
-
- printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
- // resize clock
- // 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;
+ Clock *clock = obj;
+ Panel *panel = clock->area.panel;
+ int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
+
+ clock->area.redraw = 1;
+
+ date_height = date_width = 0;
+ strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+ get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
+ if (time2_format) {
+ strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+ get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
+ }
+
+ if (panel_horizontal) {
+ int new_size = (time_width > date_width) ? time_width : date_width;
+ new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
+ if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
+ // we try to limit the number of resize
+ clock->area.width = new_size + 1;
+ clock->time1_posy = (clock->area.height - time_height) / 2;
+ if (time2_format) {
+ clock->time1_posy -= ((date_height_ink + 2) / 2);
+ clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+ }
+ ret = 1;