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

Removing an unused variable from GtkCellRendererText->get_preferred_width()

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-12-04 14:04:25 +09:00
parent c5a60e035d
commit 2a41de70b1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkcellrenderertext.c
View File

@ -2103,7 +2103,7 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
PangoContext *context; PangoContext *context;
PangoFontMetrics *metrics; PangoFontMetrics *metrics;
PangoRectangle rect; PangoRectangle rect;
gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width, xpad; gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, xpad;
gint min_width, nat_width; gint min_width, nat_width;
/* "width-chars" Hard-coded minimum width: /* "width-chars" Hard-coded minimum width:
@ -2124,10 +2124,6 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
layout = get_layout (celltext, widget, NULL, 0); layout = get_layout (celltext, widget, NULL, 0);
/* Get the layout with the text possibly wrapping at wrap_width */
pango_layout_get_pixel_extents (layout, NULL, &rect);
guess_width = rect.width;
/* Fetch the length of the complete unwrapped text */ /* Fetch the length of the complete unwrapped text */
pango_layout_set_width (layout, -1); pango_layout_set_width (layout, -1);
pango_layout_get_extents (layout, NULL, &rect); pango_layout_get_extents (layout, NULL, &rect);
@ -2168,6 +2164,7 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
else else
nat_width = xpad * 2 + PANGO_PIXELS (text_width); nat_width = xpad * 2 + PANGO_PIXELS (text_width);
nat_width = MAX (nat_width, min_width); nat_width = MAX (nat_width, min_width);
if (priv->max_width_chars > 0) if (priv->max_width_chars > 0)
@ -2183,7 +2180,6 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
if (natural_size) if (natural_size)
*natural_size = nat_width; *natural_size = nat_width;
} }
static void static void