AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-20 02:10:12 +00:00
Code Issues Projects Releases Wiki Activity

Fixed testellipsize

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-04-19 14:04:20 -04:00
parent a141c66253
commit e9e3725ee7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtklabel.c
View File

@ -3024,9 +3024,10 @@ get_label_width (GtkLabel *label,
*natural = MAX (*minimum, max_width);
}
}
}
else
{
/* XXX Do something about width_chars/max_width_chars when no ellipsize/wrap is set */
*minimum = text_width;
*natural = *minimum;
}
@ -3424,9 +3425,9 @@ gtk_label_get_desired_size (GtkExtendedLayout *layout,
(required_rect.width + label->misc.xpad * 2), minimum_size, natural_size);
else
{
/* If there is no wrapping, the height is static */
/* If there is no wrapping, the height is either static or rotated and ellipsized */
*minimum_size = required_rect.height + label->misc.ypad * 2;
*natural_size = *minimum_size;
*natural_size = natural_rect.height + label->misc.ypad * 2;
}
}
}