diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2005-02-01 18:13:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-02-01 18:13:06 +0000 |
| commit | 2fc5429c28aeef6c75e2f6180d782296f1c28d0c (patch) | |
| tree | 02bcf29cc0106bfd4eb90f344dc6c30e9b715d00 /gtk/gtkcellrenderertext.c | |
| parent | 673f0a86b96eeacfc12ed4e1cd5d87e9a7a54983 (diff) | |
| download | gtk+-2fc5429c28aeef6c75e2f6180d782296f1c28d0c.tar.gz | |
Forgotten file, ChangeLog from 2005-01-27
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
| -rw-r--r-- | gtk/gtkcellrenderertext.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 972bb37015..cda7fece14 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1532,7 +1532,8 @@ get_size (GtkCellRenderer *cell, char_width = pango_font_metrics_get_approximate_char_width (metrics); pango_font_metrics_unref (metrics); - *width += (PANGO_PIXELS (char_width) * MAX (priv->width_chars, 3)); + *width = GTK_CELL_RENDERER (celltext)->xpad * 2 + + (PANGO_PIXELS (char_width) * MAX (priv->width_chars, 3)); } else { @@ -1653,12 +1654,9 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, if (priv->ellipsize_set) pango_layout_set_width (layout, (cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE); - else if (priv->wrap_width != -1) - pango_layout_set_width (layout, - priv->wrap_width * PANGO_SCALE); - else + else if (priv->wrap_width == -1) pango_layout_set_width (layout, -1); - + gtk_paint_layout (widget->style, window, state, |