brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Use ClutterGrab for StScrollBar implicit grab

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2045>
This commit is contained in:
Carlos Garnacho 2021-11-18 00:00:26 +01:00
parent bcfcacdb56
commit a8a9d4f806
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/st/st-scroll-bar.c
View File

@ -54,6 +54,7 @@ struct _StScrollBarPrivate
gfloat y_origin; gfloat y_origin;
ClutterInputDevice *grab_device; ClutterInputDevice *grab_device;
ClutterGrab *grab;
ClutterActor *trough; ClutterActor *trough;
ClutterActor *handle; ClutterActor *handle;
@ -626,7 +627,12 @@ stop_scrolling (StScrollBar *bar)
st_widget_remove_style_pseudo_class (ST_WIDGET (priv->handle), "active"); st_widget_remove_style_pseudo_class (ST_WIDGET (priv->handle), "active");
clutter_input_device_ungrab (priv->grab_device); if (priv->grab)
{
clutter_grab_dismiss (priv->grab);
g_clear_pointer (&priv->grab, clutter_grab_unref);
}
priv->grab_device = NULL; priv->grab_device = NULL;
g_signal_emit (bar, signals[SCROLL_STOP], 0); g_signal_emit (bar, signals[SCROLL_STOP], 0);
} }
@ -663,6 +669,7 @@ handle_button_press_event_cb (ClutterActor *actor,
{ {
StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (bar); StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (bar);
ClutterInputDevice *device = clutter_event_get_device ((ClutterEvent*) event); ClutterInputDevice *device = clutter_event_get_device ((ClutterEvent*) event);
ClutterActor *stage;
if (event->button != 1) if (event->button != 1)
return FALSE; return FALSE;
@ -682,7 +689,8 @@ handle_button_press_event_cb (ClutterActor *actor,
g_assert (!priv->grab_device); g_assert (!priv->grab_device);
clutter_input_device_grab (device, priv->handle); stage = clutter_actor_get_stage (actor);
priv->grab = clutter_stage_grab (CLUTTER_STAGE (stage), priv->handle);
priv->grab_device = device; priv->grab_device = device;
g_signal_emit (bar, signals[SCROLL_START], 0); g_signal_emit (bar, signals[SCROLL_START], 0);