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

clutter/stage: Pick with clutter_actor_pick()

Browse Source 
Use the new function to perform picking.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/865
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-17 17:04:32 +02:00
parent ff8ed70f84
commit 86a5358812
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter/clutter-stage.c
View File

@ -1019,7 +1019,7 @@ clutter_stage_pick (ClutterActor *self)
*/ */
clutter_actor_iter_init (&iter, self); clutter_actor_iter_init (&iter, self);
while (clutter_actor_iter_next (&iter, &child)) while (clutter_actor_iter_next (&iter, &child))
clutter_actor_paint (child); clutter_actor_pick (child);
} }
static gboolean static gboolean
@ -1702,7 +1702,8 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
cogl_push_framebuffer (fb); cogl_push_framebuffer (fb);
context->pick_mode = mode; context->pick_mode = mode;
clutter_stage_do_paint_view (stage, view, NULL); setup_view_for_pick_or_paint (stage, view, NULL);
clutter_actor_pick (CLUTTER_ACTOR (stage));
context->pick_mode = CLUTTER_PICK_NONE; context->pick_mode = CLUTTER_PICK_NONE;
priv->cached_pick_mode = mode; priv->cached_pick_mode = mode;

2
clutter/clutter/deprecated/clutter-group.c
View File

@ -298,7 +298,7 @@ clutter_group_real_pick (ClutterActor *actor)
/* Chain up so we get a bounding box pained (if we are reactive) */ /* Chain up so we get a bounding box pained (if we are reactive) */
CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor); CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor);
g_list_foreach (priv->children, (GFunc) clutter_actor_paint, NULL); g_list_foreach (priv->children, (GFunc) clutter_actor_pick, NULL);
} }
static void static void