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

2007-09-25 Ross Burton <ross@openedhand.com>

Browse Source 
Merge from stable.
	
	* clutter/clutter-group.c:
	Optimise sort_z_order.
This commit is contained in:
Ross Burton 2007-09-25 13:22:24 +00:00
parent c7ff2b7651
commit bc7b1b3a16
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-09-25 Ross Burton <ross@openedhand.com>
Merge from stable.
* clutter/clutter-group.c:
Optimise sort_z_order.
2007-09-17 Emmanuele Bassi <ebassi@openedhand.com> 2007-09-17 Emmanuele Bassi <ebassi@openedhand.com>
Merge from stable Merge from stable

10
clutter/clutter-group.c
View File

@ -404,13 +404,15 @@ static gint
sort_z_order (gconstpointer a, sort_z_order (gconstpointer a,
gconstpointer b) gconstpointer b)
{ {
ClutterActor *actor_a = CLUTTER_ACTOR (a); int depth_a, depth_b;
ClutterActor *actor_b = CLUTTER_ACTOR (b);
if (clutter_actor_get_depth (actor_a) == clutter_actor_get_depth (actor_b)) depth_a = clutter_actor_get_depth (a);
depth_b = clutter_actor_get_depth (b);
if (depth_a == depth_b)
return 0; return 0;
if (clutter_actor_get_depth (actor_a) > clutter_actor_get_depth (actor_b)) if (depth_a > depth_b)
return 1; return 1;
return -1; return -1;