|
 |
4b6d7b |
diff -up evolution-3.12.11/calendar/gui/e-day-view-main-item.c.calendar-event-time-font evolution-3.12.11/calendar/gui/e-day-view-main-item.c
|
|
|
4b6d7b |
--- evolution-3.12.11/calendar/gui/e-day-view-main-item.c.calendar-event-time-font 2014-07-21 15:49:19.000000000 +0200
|
|
|
4b6d7b |
+++ evolution-3.12.11/calendar/gui/e-day-view-main-item.c 2015-06-04 19:37:44.164986574 +0200
|
|
|
4b6d7b |
@@ -211,6 +211,7 @@ day_view_main_item_draw_day_event (EDayV
|
|
|
4b6d7b |
gchar *text = NULL;
|
|
|
4b6d7b |
gint scroll_flag = 0;
|
|
|
4b6d7b |
gint row_y;
|
|
|
4b6d7b |
+ PangoLayout *layout;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
day_view = e_day_view_main_item_get_day_view (main_item);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
@@ -554,24 +555,29 @@ day_view_main_item_draw_day_event (EDayV
|
|
|
4b6d7b |
cairo_new_path (cr);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (e_cal_model_get_use_24_hour_format (model)) {
|
|
|
4b6d7b |
- cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 32, item_y + item_h - 8);
|
|
|
4b6d7b |
+ cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 35, item_y + item_h - 8 - 14);
|
|
|
4b6d7b |
end_regsizeime = g_strdup_printf (
|
|
|
4b6d7b |
"%2i:%02i",
|
|
|
4b6d7b |
end_display_hour, end_minute);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
} else {
|
|
|
4b6d7b |
- cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 48, item_y + item_h - 8);
|
|
|
4b6d7b |
+ cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 51, item_y + item_h - 8 - 14);
|
|
|
4b6d7b |
end_regsizeime = g_strdup_printf (
|
|
|
4b6d7b |
"%2i:%02i%s",
|
|
|
4b6d7b |
end_display_hour, end_minute,
|
|
|
4b6d7b |
end_resize_suffix);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
- cairo_set_font_size (cr, 14);
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (main_item)->canvas), end_regsizeime);
|
|
|
4b6d7b |
+ cairo_set_font_size (cr, 13);
|
|
|
4b6d7b |
if ((red / cc > 0.7) || (green / cc > 0.7) || (blue / cc > 0.7))
|
|
|
4b6d7b |
cairo_set_source_rgb (cr, 0, 0, 0);
|
|
|
4b6d7b |
else
|
|
|
4b6d7b |
cairo_set_source_rgb (cr, 1, 1, 1);
|
|
|
4b6d7b |
- cairo_show_text (cr, end_regsizeime);
|
|
|
4b6d7b |
+ pango_cairo_update_layout (cr, layout);
|
|
|
4b6d7b |
+ pango_cairo_show_layout (cr, layout);
|
|
|
4b6d7b |
+ g_object_unref (layout);
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
cairo_close_path (cr);
|
|
|
4b6d7b |
cairo_restore (cr);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
@@ -801,16 +807,21 @@ day_view_main_item_draw_day_event (EDayV
|
|
|
4b6d7b |
if (icon_x_inc == 0)
|
|
|
4b6d7b |
icon_x += 14;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- if (resize_flag)
|
|
|
4b6d7b |
- cairo_move_to (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 10, item_y + 13);
|
|
|
4b6d7b |
- else
|
|
|
4b6d7b |
- cairo_move_to (cr, icon_x, item_y + 13);
|
|
|
4b6d7b |
if ((red / cc > 0.7) || (green / cc > 0.7) || (blue / cc > 0.7))
|
|
|
4b6d7b |
cairo_set_source_rgb (cr, 0, 0, 0);
|
|
|
4b6d7b |
else
|
|
|
4b6d7b |
cairo_set_source_rgb (cr, 1, 1, 1);
|
|
|
4b6d7b |
- cairo_set_font_size (cr, 14.0);
|
|
|
4b6d7b |
- cairo_show_text (cr, text);
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (main_item)->canvas), text);
|
|
|
4b6d7b |
+ if (resize_flag)
|
|
|
4b6d7b |
+ cairo_translate (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 10, item_y + 1);
|
|
|
4b6d7b |
+ else
|
|
|
4b6d7b |
+ cairo_translate (cr, icon_x, item_y + 1);
|
|
|
4b6d7b |
+ cairo_set_font_size (cr, 13.0);
|
|
|
4b6d7b |
+ pango_cairo_update_layout (cr, layout);
|
|
|
4b6d7b |
+ pango_cairo_show_layout (cr, layout);
|
|
|
4b6d7b |
+ g_object_unref (layout);
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
cairo_close_path (cr);
|
|
|
4b6d7b |
cairo_restore (cr);
|
|
|
4b6d7b |
}
|