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

2006-06-01 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-element.c:
        Fix a snafu in clutter_element_raise ()

        * clutter/clutter-timeline.c:
        * clutter/clutter-timeline.h:
        Add new clutter_timeline_is_playing() method
This commit is contained in:
Matthew Allum 2006-06-01 21:37:28 +00:00
parent 70ed2f4233
commit 6c471cb7e1
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-06-01 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-element.c:
Fix a snafu in clutter_element_raise ()
* clutter/clutter-timeline.c:
* clutter/clutter-timeline.h:
Add new clutter_timeline_is_playing() method
2006-05-29 Matthew Allum <mallum@openedhand.com> 2006-05-29 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-color.c: (clutter_color_set): * clutter/clutter-color.c: (clutter_color_set):

3
clutter/clutter-element.c
View File

@ -1170,9 +1170,8 @@ clutter_element_get_parent (ClutterElement *self)
void void
clutter_element_raise (ClutterElement *self, ClutterElement *below) clutter_element_raise (ClutterElement *self, ClutterElement *below)
{ {
g_return_if_fail (CLUTTER_IS_ELEMENT(self));
g_return_if_fail (clutter_element_get_parent (self) != NULL); g_return_if_fail (clutter_element_get_parent (self) != NULL);
g_return_if_fail
(clutter_element_get_parent (self) != clutter_element_get_parent (below));
clutter_group_raise (CLUTTER_GROUP(clutter_element_get_parent (self)), clutter_group_raise (CLUTTER_GROUP(clutter_element_get_parent (self)),
self, self,

15
clutter/clutter-timeline.c
View File

@ -462,6 +462,21 @@ clutter_timeline_set_speed (ClutterTimeline *timeline, guint fps)
} }
} }
/**
* clutter_timeline_is_playing:
* @timeline: A #ClutterTimeline
*
* Query state of a #ClutterTimeline instance.
*
* Return Value: TRUE if timeline is currently playing, FALSE if not.
*/
gboolean
clutter_timeline_is_playing (ClutterTimeline *timeline)
{
return (timeline->priv->timeout_id != 0);
}
/** /**
* clutter_timeline_new: * clutter_timeline_new:
* @nframes: #ClutterTimeline number of frames * @nframes: #ClutterTimeline number of frames

3
clutter/clutter-timeline.h
View File

@ -107,6 +107,9 @@ clutter_timeline_get_current_frame (ClutterTimeline *timeline);
guint guint
clutter_timeline_get_n_frames (ClutterTimeline *timeline); clutter_timeline_get_n_frames (ClutterTimeline *timeline);
gboolean
clutter_timeline_is_playing (ClutterTimeline *timeline);
G_END_DECLS G_END_DECLS
#endif #endif