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

label: Only get font metrics if we have to

Browse Source 
Getting these metrics is expensive, so avoid it if possible.
This commit is contained in:
Benjamin Otte 2011-03-29 03:31:09 +02:00
parent 6ba3ef5d82
commit 0930de9446
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtklabel.c
View File

@ -3091,20 +3091,12 @@ get_label_width (GtkLabel *label,
{ {
GtkLabelPrivate *priv; GtkLabelPrivate *priv;
PangoLayout *layout; PangoLayout *layout;
PangoContext *context;
PangoFontMetrics *metrics;
PangoRectangle rect; PangoRectangle rect;
gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width; gint text_width, ellipsize_chars, guess_width;
priv = label->priv; priv = label->priv;
layout = gtk_label_get_measuring_layout (label, NULL, -1); layout = gtk_label_get_measuring_layout (label, NULL, -1);
context = pango_layout_get_context (layout);
metrics = get_font_metrics (context, GTK_WIDGET (label));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
char_pixels = MAX (char_width, digit_width);
pango_font_metrics_unref (metrics);
/* Fetch the length of the complete unwrapped text */ /* Fetch the length of the complete unwrapped text */
pango_layout_get_extents (layout, NULL, &rect); pango_layout_get_extents (layout, NULL, &rect);
@ -3141,6 +3133,17 @@ get_label_width (GtkLabel *label,
if (priv->ellipsize || priv->wrap) if (priv->ellipsize || priv->wrap)
{ {
PangoContext *context;
PangoFontMetrics *metrics;
gint char_width, digit_width, char_pixels;
context = pango_layout_get_context (layout);
metrics = get_font_metrics (context, GTK_WIDGET (label));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
char_pixels = MAX (char_width, digit_width);
pango_font_metrics_unref (metrics);
*minimum = char_pixels * MAX (priv->width_chars, ellipsize_chars); *minimum = char_pixels * MAX (priv->width_chars, ellipsize_chars);
/* Default to the minimum width regularly guessed by GTK+ if no minimum /* Default to the minimum width regularly guessed by GTK+ if no minimum