isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Use ClutterPoint for the fixed position

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-03-30 18:43:59 +01:00
parent 61f17e345a
commit b7b641d5d3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-actor-private.h
View File

@ -162,8 +162,7 @@ struct _SizeRequest
struct _ClutterLayoutInfo struct _ClutterLayoutInfo
{ {
/* fixed position coordinates */ /* fixed position coordinates */
float fixed_x; ClutterPoint fixed_pos;
float fixed_y;
ClutterMargin margin; ClutterMargin margin;

23
clutter/clutter-actor.c
View File

@ -4626,7 +4626,7 @@ clutter_actor_get_property (GObject *object,
const ClutterLayoutInfo *info; const ClutterLayoutInfo *info;
info = _clutter_actor_get_layout_info_or_defaults (actor); info = _clutter_actor_get_layout_info_or_defaults (actor);
g_value_set_float (value, info->fixed_x); g_value_set_float (value, info->fixed_pos.x);
} }
break; break;
@ -4635,7 +4635,7 @@ clutter_actor_get_property (GObject *object,
const ClutterLayoutInfo *info; const ClutterLayoutInfo *info;
info = _clutter_actor_get_layout_info_or_defaults (actor); info = _clutter_actor_get_layout_info_or_defaults (actor);
g_value_set_float (value, info->fixed_y); g_value_set_float (value, info->fixed_pos.y);
} }
break; break;
@ -8796,8 +8796,8 @@ clutter_actor_move_by (ClutterActor *self,
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
x = info->fixed_x; x = info->fixed_pos.x;
y = info->fixed_y; y = info->fixed_pos.y;
clutter_actor_set_position (self, x + dx, y + dy); clutter_actor_set_position (self, x + dx, y + dy);
} }
@ -9578,12 +9578,12 @@ clutter_actor_set_x_internal (ClutterActor *self,
linfo = _clutter_actor_get_layout_info (self); linfo = _clutter_actor_get_layout_info (self);
if (priv->position_set && linfo->fixed_x == x) if (priv->position_set && linfo->fixed_pos.x == x)
return; return;
clutter_actor_store_old_geometry (self, &old); clutter_actor_store_old_geometry (self, &old);
linfo->fixed_x = x; linfo->fixed_pos.x = x;
clutter_actor_set_fixed_position_set (self, TRUE); clutter_actor_set_fixed_position_set (self, TRUE);
clutter_actor_notify_if_geometry_changed (self, &old); clutter_actor_notify_if_geometry_changed (self, &old);
@ -9601,12 +9601,12 @@ clutter_actor_set_y_internal (ClutterActor *self,
linfo = _clutter_actor_get_layout_info (self); linfo = _clutter_actor_get_layout_info (self);
if (priv->position_set && linfo->fixed_y == y) if (priv->position_set && linfo->fixed_pos.y == y)
return; return;
clutter_actor_store_old_geometry (self, &old); clutter_actor_store_old_geometry (self, &old);
linfo->fixed_y = y; linfo->fixed_pos.y = y;
clutter_actor_set_fixed_position_set (self, TRUE); clutter_actor_set_fixed_position_set (self, TRUE);
clutter_actor_notify_if_geometry_changed (self, &old); clutter_actor_notify_if_geometry_changed (self, &old);
@ -9717,7 +9717,7 @@ clutter_actor_get_x (ClutterActor *self)
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
return info->fixed_x; return info->fixed_pos.x;
} }
else else
return 0; return 0;
@ -9765,7 +9765,7 @@ clutter_actor_get_y (ClutterActor *self)
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
return info->fixed_y; return info->fixed_pos.y;
} }
else else
return 0; return 0;
@ -15817,8 +15817,7 @@ clutter_actor_get_layout_manager (ClutterActor *self)
} }
static const ClutterLayoutInfo default_layout_info = { static const ClutterLayoutInfo default_layout_info = {
0.f, /* fixed-x */ CLUTTER_POINT_INIT_ZERO, /* fixed-pos */
0.f, /* fixed-y */
{ 0, 0, 0, 0 }, /* margin */ { 0, 0, 0, 0 }, /* margin */
CLUTTER_ACTOR_ALIGN_FILL, /* x-align */ CLUTTER_ACTOR_ALIGN_FILL, /* x-align */
CLUTTER_ACTOR_ALIGN_FILL, /* y-align */ CLUTTER_ACTOR_ALIGN_FILL, /* y-align */