1 --- gtk+-2.6.4/gtk/gtkcellrenderertext.c 2005-01-09 19:32:25.000000000 +0200
2 +++ gtk+-2.6.4/gtk/gtkcellrenderertext.c 2005-04-06 16:19:36.274023872 +0300
5 GTK_CELL_RENDERER (celltext)->xalign = 0.0;
6 GTK_CELL_RENDERER (celltext)->yalign = 0.5;
7 - GTK_CELL_RENDERER (celltext)->xpad = 2;
8 - GTK_CELL_RENDERER (celltext)->ypad = 2;
9 + GTK_CELL_RENDERER (celltext)->xpad = 0;
10 + GTK_CELL_RENDERER (celltext)->ypad = 0;
11 celltext->fixed_height_rows = -1;
12 celltext->font = pango_font_description_new ();
15 /* The minimum size for ellipsized labels is ~ 3 chars */
18 - if (priv->ellipsize || priv->width_chars > 0)
19 + /*if (priv->ellipsize || priv->width_chars > 0)
21 PangoContext *context;
22 PangoFontMetrics *metrics;
24 *width += (PANGO_PIXELS (char_width) * MAX (priv->width_chars, 3));
29 *width = GTK_CELL_RENDERER (celltext)->xpad * 2 + rect.width;
38 GtkCellRendererTextPrivate *priv;
39 + PangoRectangle logical_rect;
41 priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
44 else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
45 GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
47 - state = GTK_STATE_PRELIGHT;
48 + state = GTK_STATE_NORMAL;
52 @@ -1559,6 +1560,14 @@
56 + /* Dirty Hildon hack to force ellipsation */
57 + pango_layout_get_extents (layout, NULL, &logical_rect);
58 + if (PANGO_PIXELS (logical_rect.width) > MIN (background_area->width, expose_area->width))
60 + priv->ellipsize = PANGO_ELLIPSIZE_END;
61 + priv->ellipsize_set = TRUE;
65 pango_layout_set_width (layout,
66 (cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE);