From 6965781d5987d773e030c2a1bc91cc58d4cd57db Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 17 Oct 2019 16:59:13 +0200 Subject: [PATCH] st: Use clutter_actor_pick() in pick Use the new function to perform picking and avoid going through any painting-related code paths. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/773 --- src/st/st-box-layout.c | 2 +- src/st/st-scroll-view.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/st/st-box-layout.c b/src/st/st-box-layout.c index 31a8ed118..0f02a478b 100644 --- a/src/st/st-box-layout.c +++ b/src/st/st-box-layout.c @@ -489,7 +489,7 @@ st_box_layout_pick (ClutterActor *actor) for (child = clutter_actor_get_first_child (actor); child != NULL; child = clutter_actor_get_next_sibling (child)) - clutter_actor_paint (child); + clutter_actor_pick (child); if (priv->hadjustment || priv->vadjustment) cogl_framebuffer_pop_clip (fb); diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c index 3e5e24eba..029e4a356 100644 --- a/src/st/st-scroll-view.c +++ b/src/st/st-scroll-view.c @@ -302,11 +302,11 @@ st_scroll_view_pick (ClutterActor *actor) CLUTTER_ACTOR_CLASS (st_scroll_view_parent_class)->pick (actor); if (priv->child) - clutter_actor_paint (priv->child); + clutter_actor_pick (priv->child); if (priv->hscrollbar_visible) - clutter_actor_paint (priv->hscroll); + clutter_actor_pick (priv->hscroll); if (priv->vscrollbar_visible) - clutter_actor_paint (priv->vscroll); + clutter_actor_pick (priv->vscroll); } static gboolean