From 93577ad153e335399564eb68c3f16cd492f2c23b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 24 Aug 2006 14:21:20 +0000 Subject: Don't manipulate the style's font description and don't use custom sizes 2006-08-24 Ross Burton * gui/e-week-view-main-item.c: Don't manipulate the style's font description and don't use custom sizes (#347933). svn path=/trunk/; revision=32657 --- calendar/ChangeLog | 6 ++++++ calendar/gui/e-week-view-main-item.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b2e4a44953..aaa317892a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2006-08-24 Ross Burton + + * gui/e-week-view-main-item.c: + Don't manipulate the style's font description and don't use custom + sizes (#347933). + 2006-08-23 Kjartan Maraas * gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb): diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index 5da9600562..1d7203acb2 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -421,7 +421,7 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, cr = gdk_cairo_create (drawable); /* Set up Pango prerequisites */ - font_desc = style->font_desc; + font_desc = pango_font_description_copy (style->font_desc); pango_context = gtk_widget_get_pango_context (GTK_WIDGET (week_view)); font_metrics = pango_context_get_metrics (pango_context, font_desc, pango_context_get_language (pango_context)); @@ -575,7 +575,6 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, format_string ? format_string : "%d", date); pango_cairo_update_context (cr, pango_context); layout = pango_cairo_create_layout (cr); - pango_font_description_set_size (font_desc, 10 * PANGO_SCALE); pango_layout_set_font_description (layout, font_desc); pango_layout_set_text (layout, buffer, -1); pango_layout_set_markup (layout, buffer, strlen(buffer)); @@ -584,7 +583,6 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, format_string ? format_string : "%d", date); pango_cairo_update_context (cr, pango_context); layout = pango_cairo_create_layout (cr); - pango_font_description_set_size (font_desc, 10 * PANGO_SCALE); pango_layout_set_font_description (layout, font_desc); pango_layout_set_text (layout, buffer, -1); } @@ -610,6 +608,7 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, cairo_restore (cr); } pango_font_metrics_unref (font_metrics); + pango_font_description_free (font_desc); cairo_destroy (cr); } #endif -- cgit v1.2.3