[mutter/gbsneto/split-pick-paint: 3/4] clutter/stage: Pick with clutter_actor_pick()
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/split-pick-paint: 3/4] clutter/stage: Pick with clutter_actor_pick()
- Date: Sun, 20 Oct 2019 13:48:14 +0000 (UTC)
commit 5ab6e5019e22e13850c1171636769ab0dc540f5c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Oct 17 17:04:32 2019 +0200
clutter/stage: Pick with clutter_actor_pick()
Use the new function to perform picking.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/865
clutter/clutter/clutter-stage.c | 5 +++--
clutter/clutter/deprecated/clutter-group.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 20c73c810..a057c3166 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1019,7 +1019,7 @@ clutter_stage_pick (ClutterActor *self)
*/
clutter_actor_iter_init (&iter, self);
while (clutter_actor_iter_next (&iter, &child))
- clutter_actor_paint (child);
+ clutter_actor_pick (child);
}
static gboolean
@@ -1702,7 +1702,8 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
cogl_push_framebuffer (fb);
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;
priv->cached_pick_mode = mode;
diff --git a/clutter/clutter/deprecated/clutter-group.c b/clutter/clutter/deprecated/clutter-group.c
index f4c471356..519fded14 100644
--- a/clutter/clutter/deprecated/clutter-group.c
+++ b/clutter/clutter/deprecated/clutter-group.c
@@ -298,7 +298,7 @@ clutter_group_real_pick (ClutterActor *actor)
/* Chain up so we get a bounding box pained (if we are reactive) */
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]