diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-04-02 11:08:29 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-04-02 11:08:29 +0800 |
| commit | c8e1c20b8a6b5ba84785ef63fcb4c2f4224dd0bc (patch) | |
| tree | a665be846430589993d9cf01e7d0151d3f121df1 /calendar/gui/e-day-view-time-item.c | |
| parent | 9f06cc49809acd03ce9367d6851f9f217bd33d27 (diff) | |
| download | gsoc2013-evolution-c8e1c20b8a6b5ba84785ef63fcb4c2f4224dd0bc.tar.gz gsoc2013-evolution-c8e1c20b8a6b5ba84785ef63fcb4c2f4224dd0bc.tar.zst gsoc2013-evolution-c8e1c20b8a6b5ba84785ef63fcb4c2f4224dd0bc.zip | |
Nuke GdkFont and use Pango's font measuring.
2003-04-01 Hans Petter Jansson <hpj@ximian.com>
* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
Nuke GdkFont and use Pango's font measuring.
* gui/e-day-view-time-itme.c (e_day_view_time_item_get_column_width)
(e_day_view_time_item_draw): Ditto.
* gui/e-day-view-top-item.c (e_day_view_top_item_draw)
(e_day_view_top_item_draw_long_event): Ditto.
* gui/e-day-view.c (e_day_view_style_set)
(e_day_view_recalc_cell_sizes)
(e_day_view_reshape_long_event)
(e_day_view_update_top_canvas_drag)
(e_day_view_update_main_canvas_drag): Ditto.
* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set)
(e_meeting_time_selector_recalc_date_form): Ditto.
* gui/e-week-view-event-item.c (e_week_view_draw_time): Ditto.
* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
Ditto.
* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
Ditto.
* gui/e-week-view.c (e_week_view_style_set)
(e_week_view_recalc_cell_sizes)
(e_week_view_reshape_event_span): Ditto.
* gui/weekday-picker.c (weekday_picker_style_set): Ditto.
svn path=/trunk/; revision=20627
Diffstat (limited to 'calendar/gui/e-day-view-time-item.c')
| -rw-r--r-- | calendar/gui/e-day-view-time-item.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index ab55bc2b9d..5613a15ec2 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -181,7 +181,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem) { EDayView *day_view; GtkStyle *style; - GdkFont *small_font; gint digit, large_digit_width, max_large_digit_width = 0; gint max_suffix_width, max_minute_or_suffix_width; gint column_width_default, column_width_60_min_rows; @@ -192,8 +191,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem) style = gtk_widget_get_style (GTK_WIDGET (day_view)); g_return_val_if_fail (style != NULL, 0); - small_font = gtk_style_get_font (style); - g_return_val_if_fail (small_font != NULL, 0); context = gtk_widget_get_pango_context (GTK_WIDGET (day_view)); @@ -260,7 +257,6 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item, EDayView *day_view; EDayViewTimeItem *dvtmitem; GtkStyle *style; - GdkFont *small_font; GdkGC *fg_gc, *dark_gc; gchar buffer[64], *suffix; gint hour, display_hour, minute, row; @@ -272,18 +268,20 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item, PangoLayout *layout; PangoContext *context; PangoFontDescription *small_font_desc; - PangoFontMetrics *large_font_metrics; + PangoFontMetrics *large_font_metrics, *small_font_metrics; dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item); day_view = dvtmitem->day_view; g_return_if_fail (day_view != NULL); style = gtk_widget_get_style (GTK_WIDGET (day_view)); - small_font = gtk_style_get_font (style); small_font_desc = style->font_desc; context = gtk_widget_get_pango_context (GTK_WIDGET (day_view)); - large_font_metrics = pango_context_get_metrics (context, day_view->large_font_desc, NULL); + large_font_metrics = pango_context_get_metrics (context, day_view->large_font_desc, + pango_context_get_language (context)); + small_font_metrics = pango_context_get_metrics (context, small_font_desc, + pango_context_get_language (context)); fg_gc = style->fg_gc[GTK_STATE_NORMAL]; dark_gc = style->dark_gc[GTK_STATE_NORMAL]; @@ -373,9 +371,9 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item, g_snprintf (buffer, sizeof (buffer), "%i %s", display_hour, suffix); } - minute_width = gdk_string_width (small_font, buffer); layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); + pango_layout_get_pixel_size (layout, &minute_width, NULL); gdk_draw_layout (drawable, fg_gc, minute_x2 - minute_width, row_y + small_font_y_offset, |