[StTooltip] Fix _get_preferred_width
It was ignoring the label width. https://bugzilla.gnome.org/show_bug.cgi?id=600734
This commit is contained in:
parent
8040ad61c6
commit
263d738ef6
@ -148,7 +148,6 @@ st_tooltip_get_preferred_width (ClutterActor *self,
|
|||||||
{
|
{
|
||||||
StTooltipPrivate *priv = ST_TOOLTIP (self)->priv;
|
StTooltipPrivate *priv = ST_TOOLTIP (self)->priv;
|
||||||
StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
|
StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
|
||||||
gfloat min_label_w, natural_label_w;
|
|
||||||
gfloat label_height, arrow_height;
|
gfloat label_height, arrow_height;
|
||||||
ClutterActor *arrow_image;
|
ClutterActor *arrow_image;
|
||||||
|
|
||||||
@ -180,13 +179,8 @@ st_tooltip_get_preferred_width (ClutterActor *self,
|
|||||||
{
|
{
|
||||||
clutter_actor_get_preferred_width (priv->label,
|
clutter_actor_get_preferred_width (priv->label,
|
||||||
label_height,
|
label_height,
|
||||||
&min_label_w,
|
min_width_p,
|
||||||
&natural_label_w);
|
natural_width_p);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
min_label_w = 0;
|
|
||||||
natural_label_w = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
|
st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
|
||||||
|
Loading…
Reference in New Issue
Block a user