diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-07-20 16:24:31 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-07-20 16:24:31 +0800 |
| commit | ee6d562880652864aa8da959ad4b127786a3fa3a (patch) | |
| tree | bef9d8c14cdc23affa6f3c22f75675ab0f5f7c84 /widgets/table | |
| parent | 35a3b3e69964df852a4a649336fe473a42da491c (diff) | |
| download | gsoc2013-evolution-ee6d562880652864aa8da959ad4b127786a3fa3a.tar.gz gsoc2013-evolution-ee6d562880652864aa8da959ad4b127786a3fa3a.tar.zst gsoc2013-evolution-ee6d562880652864aa8da959ad4b127786a3fa3a.zip | |
Added cairo font rendering to ECell and EText.
svn path=/trunk/; revision=32359
Diffstat (limited to 'widgets/table')
| -rw-r--r-- | widgets/table/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/table/e-cell-text.c | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index caa0788c3d..2ce971ad46 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,9 @@ +2006-07-05 Rajeev ramanathan <rajeevramanathan_2004@yaoo.co.in> + + * e-cell-text.c: (ect_unrealize), (build_layout), (ect_draw): Added + code to render ECell text items with antialiasing, hinting + and sub-pixel ordering with cairo. + 2006-07-18 Benoît Dejean <benoit@placenet.org> ** Fixes bug #333041 diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 7ea8a54c98..fee7d04cfb 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -142,7 +142,6 @@ typedef struct { int xofs, yofs; /* This gets added to the x and y for the cell text. */ double ellipsis_width[2]; /* The width of the ellipsis. */ - } ECellTextView; struct _CellEdit { @@ -439,6 +438,7 @@ ect_unrealize (ECellView *ecv) if (parent_class->unrealize) (* parent_class->unrealize) (ecv); + } static void @@ -570,6 +570,8 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) ECellText *ect = E_CELL_TEXT (ecell_view->ecell); PangoAttrList *attrs ; PangoLayout *layout; + PangoContext *context; + cairo_font_options_t *font_options; layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas), text); @@ -581,6 +583,13 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) if (text_view->edit || width <= 0) return layout; + context = pango_layout_get_context (layout); + + font_options = get_font_options(); + pango_cairo_context_set_font_options (context, font_options); + cairo_font_options_destroy (font_options); + pango_layout_context_changed (layout); + if (ect->font_name) { PangoFontDescription *desc = NULL, *fixed_desc = NULL; @@ -632,7 +641,7 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) default: break; } - + return layout; } @@ -733,10 +742,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, selected = flags & E_CELL_SELECTED; if (selected) { - if (flags & E_CELL_FOCUSED) foreground = &canvas->style->fg [GTK_STATE_SELECTED]; - else - foreground = &canvas->style->fg [GTK_STATE_ACTIVE]; } else { foreground = &canvas->style->text [GTK_STATE_NORMAL]; |