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

st: Handle emulated scroll events through the ClutterEventFlag

Browse Source 
Emulated scroll events no longer get clutter_event_is_pointer_emulated()
set to TRUE, instead this information is propagated through the
ClutterEventFlags of the event.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2871>
This commit is contained in:
Carlos Garnacho 2023-08-08 16:08:36 +02:00 committed by Marge Bot
parent b7e8f4a1f8
commit 854191c244
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,8 @@ st_scroll_bar_scroll_event (ClutterActor *actor,
ClutterTextDirection direction; ClutterTextDirection direction;
ClutterScrollDirection scroll_dir; ClutterScrollDirection scroll_dir;
if (clutter_event_is_pointer_emulated ((ClutterEvent *) event)) if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
CLUTTER_EVENT_FLAG_POINTER_EMULATED))
return TRUE; return TRUE;
direction = clutter_actor_get_text_direction (actor); direction = clutter_actor_get_text_direction (actor);

3
src/st/st-scroll-view.c
View File

@ -770,7 +770,8 @@ st_scroll_view_scroll_event (ClutterActor *self,
if (!priv->mouse_scroll) if (!priv->mouse_scroll)
return FALSE; return FALSE;
if (clutter_event_is_pointer_emulated ((ClutterEvent *) event)) if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
CLUTTER_EVENT_FLAG_POINTER_EMULATED))
return TRUE; return TRUE;
direction = clutter_actor_get_text_direction (self); direction = clutter_actor_get_text_direction (self);