[evolution/gnome-3-22] Bug 775598 - Calendar view does not follow font DPI settings fully

[Milan Crha <mcrha src gnome org>]

commit 888845eb77cf862229073680408dbf0f7c19b6a9
Author: Milan Crha <mcrha redhat com>
Date:   Wed Dec 7 19:51:28 2016 +0100

    Bug 775598 - Calendar view does not follow font DPI settings fully

 calendar/gui/e-day-view-time-item.c  |    6 +++---
 calendar/gui/e-week-view-main-item.c |    8 ++------
 e-util/e-calendar-item.c             |    2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index f2bafbd..93ea663 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -518,7 +518,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
                                gdk_cairo_set_source_color (cr, &mb_color);
                        else
                                gdk_cairo_set_source_rgba (cr, &fg);
-                       layout = pango_cairo_create_layout (cr);
+                       layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), NULL);
                        pango_layout_set_text (layout, buffer, -1);
                        pango_layout_get_pixel_size (layout, &minute_width, NULL);
                        cairo_translate (
@@ -559,7 +559,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
                                        gdk_cairo_set_source_color (cr, &mb_color);
                                else
                                        gdk_cairo_set_source_rgba (cr, &fg);
-                               layout = pango_cairo_create_layout (cr);
+                               layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), NULL);
                                pango_layout_set_text (layout, buffer, -1);
                                pango_layout_set_font_description (
                                        layout, day_view->large_font_desc);
@@ -607,7 +607,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
                                        gdk_cairo_set_source_color (cr, &mb_color);
                                else
                                        gdk_cairo_set_source_rgba (cr, &fg);
-                               layout = pango_cairo_create_layout (cr);
+                               layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), NULL);
                                pango_layout_set_text (layout, buffer, -1);
                                pango_layout_set_font_description (
                                        layout, day_view->small_font_desc);
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index cf69529..640ed91 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -251,18 +251,14 @@ week_view_main_item_draw_day (EWeekViewMainItem *main_item,
                g_date_strftime (
                        buffer, sizeof (buffer),
                        format_string ? format_string : "<b>%d</b>", date);
-               pango_cairo_update_context (cr, pango_context);
-               layout = pango_cairo_create_layout (cr);
-               pango_layout_set_font_description (layout, font_desc);
+               layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
                pango_layout_set_text (layout, buffer, -1);
                pango_layout_set_markup (layout, buffer, strlen (buffer));
        } else {
                g_date_strftime (
                        buffer, sizeof (buffer),
                        format_string ? format_string : "%d", date);
-               pango_cairo_update_context (cr, pango_context);
-               layout = pango_cairo_create_layout (cr);
-               pango_layout_set_font_description (layout, font_desc);
+               layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
                pango_layout_set_text (layout, buffer, -1);
        }
 
diff --git a/e-util/e-calendar-item.c b/e-util/e-calendar-item.c
index e63a714..bb9e803 100644
--- a/e-util/e-calendar-item.c
+++ b/e-util/e-calendar-item.c
@@ -1572,7 +1572,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem,
                + E_CALENDAR_ITEM_MIN_CELL_XPAD;
        min_cell_height = char_height + E_CALENDAR_ITEM_MIN_CELL_YPAD;
 
-       layout = pango_cairo_create_layout (cr);
+       layout = gtk_widget_create_pango_layout (GTK_WIDGET (widget), NULL);
 
        /* Calculate the number of days in the previous, current, and next
         * months. */