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
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-17 16:59:13 +02:00
parent 80680803aa
commit 6965781d59
2 changed files with 4 additions and 4 deletions

View File

@ -489,7 +489,7 @@ st_box_layout_pick (ClutterActor *actor)
for (child = clutter_actor_get_first_child (actor); for (child = clutter_actor_get_first_child (actor);
child != NULL; child != NULL;
child = clutter_actor_get_next_sibling (child)) child = clutter_actor_get_next_sibling (child))
clutter_actor_paint (child); clutter_actor_pick (child);
if (priv->hadjustment || priv->vadjustment) if (priv->hadjustment || priv->vadjustment)
cogl_framebuffer_pop_clip (fb); cogl_framebuffer_pop_clip (fb);

View File

@ -302,11 +302,11 @@ st_scroll_view_pick (ClutterActor *actor)
CLUTTER_ACTOR_CLASS (st_scroll_view_parent_class)->pick (actor); CLUTTER_ACTOR_CLASS (st_scroll_view_parent_class)->pick (actor);
if (priv->child) if (priv->child)
clutter_actor_paint (priv->child); clutter_actor_pick (priv->child);
if (priv->hscrollbar_visible) if (priv->hscrollbar_visible)
clutter_actor_paint (priv->hscroll); clutter_actor_pick (priv->hscroll);
if (priv->vscrollbar_visible) if (priv->vscrollbar_visible)
clutter_actor_paint (priv->vscroll); clutter_actor_pick (priv->vscroll);
} }
static gboolean static gboolean