isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-05-07 15:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-01-25 Emmanuele Bassi <ebassi@sprite>

Browse Source 
* clutter/clutter-label.c (clutter_label_query_coords): Check
	if the layout logical rectangle size is bigger than the bounding
	box; this usually means that the bounding box changed in one
	point and the label private allocation needs to be
	updated. (#724)
This commit is contained in:
Emmanuele Bassi 2008-01-25 21:41:50 +00:00
parent 985fa0c6b3
commit 45c040f5c4
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-01-25 Emmanuele Bassi <ebassi@sprite>
* clutter/clutter-label.c (clutter_label_query_coords): Check
if the layout logical rectangle size is bigger than the bounding
box; this usually means that the bounding box changed in one
point and the label private allocation needs to be
updated. (#724)
2008-01-25 Emmanuele Bassi <ebassi@openedhand.com> 2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/x11/Makefile.am: Add the generated clutter-x11 pkg-config * clutter/x11/Makefile.am: Add the generated clutter-x11 pkg-config

31
clutter/clutter-label.c
View File

@ -313,16 +313,11 @@ clutter_label_query_coords (ClutterActor *self,
{ {
ClutterLabel *label = CLUTTER_LABEL(self); ClutterLabel *label = CLUTTER_LABEL(self);
ClutterLabelPrivate *priv; ClutterLabelPrivate *priv;
ClutterActorBox layout_box = { 0, };
PangoRectangle logical_rect; PangoRectangle logical_rect;
priv = label->priv; priv = label->priv;
if ((priv->allocation.x2 - priv->allocation.x1) > 0)
{
*box = priv->allocation;
return;
}
if (priv->wrap) if (priv->wrap)
clutter_label_clear_layout (label); clutter_label_clear_layout (label);
@ -330,8 +325,28 @@ clutter_label_query_coords (ClutterActor *self,
pango_layout_get_extents (priv->layout, NULL, &logical_rect); pango_layout_get_extents (priv->layout, NULL, &logical_rect);
box->x2 = box->x1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width); layout_box.x1 = box->x1;
box->y2 = box->y1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.height); layout_box.x2 = box->x1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width);
layout_box.y1 = box->y1;
layout_box.y2 = box->y1 + CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.height);
if ((priv->allocation.x2 - priv->allocation.x1) > 0)
{
ClutterUnit alloc_width, alloc_height;
alloc_width = priv->allocation.x2 - priv->allocation.x1;
alloc_height = priv->allocation.y2 - priv->allocation.y1;
if ((alloc_width >= (layout_box.x2 - layout_box.x1)) &&
(alloc_height >= (layout_box.y2 - layout_box.y1)))
*box = priv->allocation;
else
*box = layout_box;
return;
}
else
*box = layout_box;
} }
static void static void