brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-02-01 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-actor.c:
	(clutter_actor_get_property): Use clutter_actor_get_reactive()
	instead of the IS_REACTIVE() macro.

	(clutter_actor_set_reactive): Emit the notify signal for the
	reactive property.

	* clutter/clutter-timeline.c:
	(timeline_timeout_func),
	(clutter_timeline_get_delta): Coding style fixes.
This commit is contained in:
Emmanuele Bassi 2008-02-01 11:22:59 +00:00
parent 756d2223da
commit ecc673d9cd
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-02-01 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.c:
(clutter_actor_get_property): Use clutter_actor_get_reactive()
instead of the IS_REACTIVE() macro.
(clutter_actor_set_reactive): Emit the notify signal for the
reactive property.
* clutter/clutter-timeline.c:
(timeline_timeout_func),
(clutter_timeline_get_delta): Coding style fixes.
2008-01-31 Rob Bradford <rob@openedhand.com> 2008-01-31 Rob Bradford <rob@openedhand.com>
* clutter/glx/clutter-stage-glx.c: * clutter/glx/clutter-stage-glx.c:

5
clutter/clutter-actor.c
View File

@ -1277,8 +1277,7 @@ clutter_actor_get_property (GObject *object,
g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->scale_y)); g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->scale_y));
break; break;
case PROP_REACTIVE: case PROP_REACTIVE:
g_value_set_boolean (value, g_value_set_boolean (value, clutter_actor_get_reactive (actor));
(CLUTTER_ACTOR_IS_REACTIVE (actor) != FALSE));
break; break;
case PROP_ROTATION_ANGLE_X: case PROP_ROTATION_ANGLE_X:
g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->rxang)); g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->rxang));
@ -3998,6 +3997,8 @@ clutter_actor_set_reactive (ClutterActor *actor,
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE); CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
else else
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE); CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
g_object_notify (G_OBJECT (actor), "reactive");
} }
/** /**

12
clutter/clutter-timeline.c
View File

@ -531,7 +531,7 @@ timeline_timeout_func (gpointer data)
/* First frame, set up timings.*/ /* First frame, set up timings.*/
priv->start_frame_secs = timeval.tv_sec; priv->start_frame_secs = timeval.tv_sec;
priv->skipped_frames = 0; priv->skipped_frames = 0;
priv->msecs_delta = 0; priv->msecs_delta = 0;
msecs = timeval.tv_usec / 1000; msecs = timeval.tv_usec / 1000;
n_frames = 1; n_frames = 1;
@ -571,10 +571,8 @@ timeline_timeout_func (gpointer data)
* to emit the last new-frame signal with the last frame * to emit the last new-frame signal with the last frame
*/ */
if (n_frames > 1) if (n_frames > 1)
{ g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0,
g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0, priv->current_frame_num);
priv->current_frame_num);
}
if (priv->loop) if (priv->loop)
{ {
@ -1250,9 +1248,7 @@ clutter_timeline_get_delta (ClutterTimeline *timeline,
priv = timeline->priv; priv = timeline->priv;
if (msecs) if (msecs)
{ *msecs = timeline->priv->msecs_delta;
*msecs = timeline->priv->msecs_delta;
}
return priv->skipped_frames + 1; return priv->skipped_frames + 1;
} }