isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

actor: Make margin properties animatable

Browse Source 
Enable implicit animations for :margin-(top|right|bottom|left)
properties.

https://bugzilla.gnome.org/show_bug.cgi?id=678264
This commit is contained in:
Bastian Winkler 2012-06-16 21:07:53 +02:00
parent 0760522643
commit d2fff6e3c3
1 changed files with 106 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
clutter/clutter-actor.c
View File

@ -1032,6 +1032,10 @@ static void on_layout_manager_changed (ClutterLayoutManager *manager,
static inline void clutter_actor_queue_compute_expand (ClutterActor *self); static inline void clutter_actor_queue_compute_expand (ClutterActor *self);
static inline void clutter_actor_set_margin_internal (ClutterActor *self,
gfloat margin,
GParamSpec *pspec);
/* Helper macro which translates by the anchor coord, applies the /* Helper macro which translates by the anchor coord, applies the
given transformation and then translates back */ given transformation and then translates back */
#define TRANSFORM_ABOUT_ANCHOR_COORD(a,m,c,_transform) G_STMT_START { \ #define TRANSFORM_ABOUT_ANCHOR_COORD(a,m,c,_transform) G_STMT_START { \
@ -6611,6 +6615,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* This property adds a margin to the actor's preferred size; the margin * This property adds a margin to the actor's preferred size; the margin
* will be automatically taken into account when allocating the actor. * will be automatically taken into account when allocating the actor.
* *
* The #ClutterActor:margin-top property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
obj_props[PROP_MARGIN_TOP] = obj_props[PROP_MARGIN_TOP] =
@ -6619,7 +6625,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Extra space at the top"), P_("Extra space at the top"),
0.0, G_MAXFLOAT, 0.0, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
CLUTTER_PARAM_ANIMATABLE);
/** /**
* ClutterActor:margin-bottom: * ClutterActor:margin-bottom:
@ -6629,6 +6637,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* This property adds a margin to the actor's preferred size; the margin * This property adds a margin to the actor's preferred size; the margin
* will be automatically taken into account when allocating the actor. * will be automatically taken into account when allocating the actor.
* *
* The #ClutterActor:margin-bottom property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
obj_props[PROP_MARGIN_BOTTOM] = obj_props[PROP_MARGIN_BOTTOM] =
@ -6637,7 +6647,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Extra space at the bottom"), P_("Extra space at the bottom"),
0.0, G_MAXFLOAT, 0.0, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
CLUTTER_PARAM_ANIMATABLE);
/** /**
* ClutterActor:margin-left: * ClutterActor:margin-left:
@ -6647,6 +6659,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* This property adds a margin to the actor's preferred size; the margin * This property adds a margin to the actor's preferred size; the margin
* will be automatically taken into account when allocating the actor. * will be automatically taken into account when allocating the actor.
* *
* The #ClutterActor:margin-left property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
obj_props[PROP_MARGIN_LEFT] = obj_props[PROP_MARGIN_LEFT] =
@ -6655,7 +6669,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Extra space at the left"), P_("Extra space at the left"),
0.0, G_MAXFLOAT, 0.0, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
CLUTTER_PARAM_ANIMATABLE);
/** /**
* ClutterActor:margin-right: * ClutterActor:margin-right:
@ -6665,6 +6681,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* This property adds a margin to the actor's preferred size; the margin * This property adds a margin to the actor's preferred size; the margin
* will be automatically taken into account when allocating the actor. * will be automatically taken into account when allocating the actor.
* *
* The #ClutterActor:margin-right property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
obj_props[PROP_MARGIN_RIGHT] = obj_props[PROP_MARGIN_RIGHT] =
@ -6673,7 +6691,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Extra space at the right"), P_("Extra space at the right"),
0.0, G_MAXFLOAT, 0.0, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
CLUTTER_PARAM_ANIMATABLE);
/** /**
* ClutterActor:background-color-set: * ClutterActor:background-color-set:
@ -13632,6 +13652,14 @@ clutter_actor_set_animatable_property (ClutterActor *actor,
clutter_actor_store_content_box (actor, g_value_get_boxed (value)); clutter_actor_store_content_box (actor, g_value_get_boxed (value));
break; break;
case PROP_MARGIN_TOP:
case PROP_MARGIN_BOTTOM:
case PROP_MARGIN_LEFT:
case PROP_MARGIN_RIGHT:
clutter_actor_set_margin_internal (actor, g_value_get_float (value),
pspec);
break;
default: default:
g_object_set_property (obj, pspec->name, value); g_object_set_property (obj, pspec->name, value);
break; break;
@ -16605,6 +16633,28 @@ clutter_actor_get_y_align (ClutterActor *self)
return _clutter_actor_get_layout_info_or_defaults (self)->y_align; return _clutter_actor_get_layout_info_or_defaults (self)->y_align;
} }
static inline void
clutter_actor_set_margin_internal (ClutterActor *self,
gfloat margin,
GParamSpec *pspec)
{
ClutterLayoutInfo *info;
info = _clutter_actor_get_layout_info (self);
if (pspec == obj_props[PROP_MARGIN_TOP])
info->margin.top = margin;
else if (pspec == obj_props[PROP_MARGIN_RIGHT])
info->margin.right = margin;
else if (pspec == obj_props[PROP_MARGIN_BOTTOM])
info->margin.bottom = margin;
else
info->margin.left = margin;
clutter_actor_queue_relayout (self);
g_object_notify_by_pspec (G_OBJECT (self), pspec);
}
/** /**
* clutter_actor_set_margin: * clutter_actor_set_margin:
* @self: a #ClutterActor * @self: a #ClutterActor
@ -16619,51 +16669,23 @@ clutter_actor_set_margin (ClutterActor *self,
const ClutterMargin *margin) const ClutterMargin *margin)
{ {
ClutterLayoutInfo *info; ClutterLayoutInfo *info;
gboolean changed;
GObject *obj;
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
g_return_if_fail (margin != NULL); g_return_if_fail (margin != NULL);
obj = G_OBJECT (self);
changed = FALSE;
g_object_freeze_notify (obj);
info = _clutter_actor_get_layout_info (self); info = _clutter_actor_get_layout_info (self);
if (info->margin.top != margin->top) if (info->margin.top != margin->top)
{ clutter_actor_set_margin_top (self, margin->top);
info->margin.top = margin->top;
g_object_notify_by_pspec (obj, obj_props[PROP_MARGIN_TOP]);
changed = TRUE;
}
if (info->margin.right != margin->right) if (info->margin.right != margin->right)
{ clutter_actor_set_margin_right (self, margin->right);
info->margin.right = margin->right;
g_object_notify_by_pspec (obj, obj_props[PROP_MARGIN_RIGHT]);
changed = TRUE;
}
if (info->margin.bottom != margin->bottom) if (info->margin.bottom != margin->bottom)
{ clutter_actor_set_margin_bottom (self, margin->bottom);
info->margin.bottom = margin->bottom;
g_object_notify_by_pspec (obj, obj_props[PROP_MARGIN_BOTTOM]);
changed = TRUE;
}
if (info->margin.left != margin->left) if (info->margin.left != margin->left)
{ clutter_actor_set_margin_left (self, margin->left);
info->margin.left = margin->left;
g_object_notify_by_pspec (obj, obj_props[PROP_MARGIN_LEFT]);
changed = TRUE;
}
if (changed)
clutter_actor_queue_relayout (self);
g_object_thaw_notify (obj);
} }
/** /**
@ -16696,6 +16718,8 @@ clutter_actor_get_margin (ClutterActor *self,
* *
* Sets the margin from the top of a #ClutterActor. * Sets the margin from the top of a #ClutterActor.
* *
* The #ClutterActor:margin-top property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
void void
@ -16712,11 +16736,16 @@ clutter_actor_set_margin_top (ClutterActor *self,
if (info->margin.top == margin) if (info->margin.top == margin)
return; return;
info->margin.top = margin; if (!_clutter_actor_get_transition (self, obj_props[PROP_MARGIN_TOP]))
{
clutter_actor_queue_relayout (self); _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_TOP],
info->margin.top, margin);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MARGIN_TOP]); }
else
{
_clutter_actor_update_transition (self, obj_props[PROP_MARGIN_TOP],
margin);
}
} }
/** /**
@ -16744,6 +16773,8 @@ clutter_actor_get_margin_top (ClutterActor *self)
* *
* Sets the margin from the bottom of a #ClutterActor. * Sets the margin from the bottom of a #ClutterActor.
* *
* The #ClutterActor:margin-bottom property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
void void
@ -16760,11 +16791,16 @@ clutter_actor_set_margin_bottom (ClutterActor *self,
if (info->margin.bottom == margin) if (info->margin.bottom == margin)
return; return;
info->margin.bottom = margin; if (!_clutter_actor_get_transition (self, obj_props[PROP_MARGIN_BOTTOM]))
{
clutter_actor_queue_relayout (self); _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_BOTTOM],
info->margin.bottom, margin);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MARGIN_BOTTOM]); }
else
{
_clutter_actor_update_transition (self, obj_props[PROP_MARGIN_BOTTOM],
margin);
}
} }
/** /**
@ -16792,6 +16828,8 @@ clutter_actor_get_margin_bottom (ClutterActor *self)
* *
* Sets the margin from the left of a #ClutterActor. * Sets the margin from the left of a #ClutterActor.
* *
* The #ClutterActor:margin-left property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
void void
@ -16808,11 +16846,16 @@ clutter_actor_set_margin_left (ClutterActor *self,
if (info->margin.left == margin) if (info->margin.left == margin)
return; return;
info->margin.left = margin; if (!_clutter_actor_get_transition (self, obj_props[PROP_MARGIN_LEFT]))
{
clutter_actor_queue_relayout (self); _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_LEFT],
info->margin.left, margin);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MARGIN_LEFT]); }
else
{
_clutter_actor_update_transition (self, obj_props[PROP_MARGIN_LEFT],
margin);
}
} }
/** /**
@ -16840,6 +16883,8 @@ clutter_actor_get_margin_left (ClutterActor *self)
* *
* Sets the margin from the right of a #ClutterActor. * Sets the margin from the right of a #ClutterActor.
* *
* The #ClutterActor:margin-right property is animatable.
*
* Since: 1.10 * Since: 1.10
*/ */
void void
@ -16858,9 +16903,16 @@ clutter_actor_set_margin_right (ClutterActor *self,
info->margin.right = margin; info->margin.right = margin;
clutter_actor_queue_relayout (self); if (!_clutter_actor_get_transition (self, obj_props[PROP_MARGIN_RIGHT]))
{
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MARGIN_RIGHT]); _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_RIGHT],
info->margin.right, margin);
}
else
{
_clutter_actor_update_transition (self, obj_props[PROP_MARGIN_RIGHT],
margin);
}
} }
/** /**