AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Forgotten file, ChangeLog from 2005-01-27

Browse Source
This commit is contained in:
Matthias Clasen 2005-02-01 18:13:06 +00:00
parent 673f0a86b9
commit 2fc5429c28
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcellrenderertext.c
View File

@ -1532,7 +1532,8 @@ get_size (GtkCellRenderer *cell,
char_width = pango_font_metrics_get_approximate_char_width (metrics); char_width = pango_font_metrics_get_approximate_char_width (metrics);
pango_font_metrics_unref (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 else
{ {
@ -1653,12 +1654,9 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell,
if (priv->ellipsize_set) if (priv->ellipsize_set)
pango_layout_set_width (layout, pango_layout_set_width (layout,
(cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE); (cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE);
else if (priv->wrap_width != -1) else if (priv->wrap_width == -1)
pango_layout_set_width (layout,
priv->wrap_width * PANGO_SCALE);
else
pango_layout_set_width (layout, -1); pango_layout_set_width (layout, -1);
gtk_paint_layout (widget->style, gtk_paint_layout (widget->style,
window, window,
state, state,