diff options
| author | Benjamin Berg <benjamin@sipsolutions.net> | 2006-12-13 17:32:49 +0000 |
|---|---|---|
| committer | Benjamin Berg <bberg@src.gnome.org> | 2006-12-13 17:32:49 +0000 |
| commit | 78fcce907fd30969949538324e47cc5f0b3e5edb (patch) | |
| tree | 4fe53c4b8b7d1a27c9f58cd114dec6ca00533d50 /gtk/gtkcellrenderertext.c | |
| parent | 9a8be321666c5ac50cea1d31efe48fed82b12017 (diff) | |
| download | gtk+-78fcce907fd30969949538324e47cc5f0b3e5edb.tar.gz | |
- Remove unused code/options from the code. Warn about their usage while
2006-12-13 Benjamin Berg <benjamin@sipsolutions.net>
* engines/clearlooks/src/clearlooks_rc_style.c:
(clearlooks_rc_style_init), (clearlooks_gtk2_rc_parse_dummy),
(clearlooks_rc_style_parse), (clearlooks_rc_style_merge):
* engines/clearlooks/src/clearlooks_rc_style.h:
* engines/clearlooks/src/clearlooks_style.c:
(clearlooks_style_draw_box), (clearlooks_style_init_from_rc),
(clearlooks_style_copy):
* engines/clearlooks/src/clearlooks_style.h:
* engines/clearlooks/src/clearlooks_types.h:
- Remove unused code/options from the code. Warn about their usage
while parsing.
* themes/Clearlooks/gtk-2.0/gtkrc:
- Remove options that don't have any effect.
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
| -rw-r--r-- | gtk/gtkcellrenderertext.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 70b6f732ee..36e597822b 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1624,6 +1624,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, gint x_offset; gint y_offset; GtkCellRendererTextPrivate *priv; + gboolean use_text; priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (cell); @@ -1675,6 +1676,8 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, cairo_destroy (cr); } + use_text = !(flags & GTK_CELL_RENDERER_USE_FG); + if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) pango_layout_set_width (layout, (cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE); @@ -1684,7 +1687,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, gtk_paint_layout (widget->style, window, state, - TRUE, + use_text, expose_area, widget, "cellrenderertext", |