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

st/scroll-bar: Use ClutterEvent getter methods

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2860>
This commit is contained in:
Carlos Garnacho 2023-08-04 14:23:09 +02:00 committed by Marge Bot
parent ca383acff6
commit 1d6a5f2697
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,7 +473,7 @@ st_scroll_bar_scroll_event (ClutterActor *actor,
return TRUE; return TRUE;
direction = clutter_actor_get_text_direction (actor); direction = clutter_actor_get_text_direction (actor);
scroll_dir = event->direction; scroll_dir = clutter_event_get_scroll_direction ((ClutterEvent *) event);
switch (scroll_dir) switch (scroll_dir)
{ {
@ -656,10 +656,13 @@ handle_motion_event_cb (ClutterActor *trough,
StScrollBar *bar) StScrollBar *bar)
{ {
StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (bar); StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (bar);
graphene_point_t coords;
if (!priv->grab_device) if (!priv->grab_device)
return FALSE; return FALSE;
move_slider (bar, event->x, event->y); clutter_event_get_position ((ClutterEvent *) event, &coords);
move_slider (bar, coords.x, coords.y);
return TRUE; return TRUE;
} }
@ -668,7 +671,7 @@ handle_button_release_event_cb (ClutterActor *trough,
ClutterButtonEvent *event, ClutterButtonEvent *event,
StScrollBar *bar) StScrollBar *bar)
{ {
if (event->button != 1) if (clutter_event_get_button ((ClutterEvent *) event) != 1)
return FALSE; return FALSE;
stop_scrolling (bar); stop_scrolling (bar);
@ -682,14 +685,17 @@ 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);
graphene_point_t coords;
ClutterActor *stage; ClutterActor *stage;
if (event->button != 1) if (clutter_event_get_button ((ClutterEvent *) event) != 1)
return FALSE; return FALSE;
clutter_event_get_position ((ClutterEvent *) event, &coords);
if (!clutter_actor_transform_stage_point (priv->handle, if (!clutter_actor_transform_stage_point (priv->handle,
event->x, coords.x,
event->y, coords.y,
&priv->x_origin, &priv->x_origin,
&priv->y_origin)) &priv->y_origin))
return FALSE; return FALSE;
@ -836,18 +842,21 @@ trough_button_press_event_cb (ClutterActor *actor,
StScrollBar *self) StScrollBar *self)
{ {
StScrollBarPrivate *priv; StScrollBarPrivate *priv;
graphene_point_t coords;
g_return_val_if_fail (self, FALSE); g_return_val_if_fail (self, FALSE);
if (event->button != 1) if (clutter_event_get_button ((ClutterEvent *) event) != 1)
return FALSE; return FALSE;
priv = st_scroll_bar_get_instance_private (self); priv = st_scroll_bar_get_instance_private (self);
if (priv->adjustment == NULL) if (priv->adjustment == NULL)
return FALSE; return FALSE;
priv->move_x = event->x; clutter_event_get_position ((ClutterEvent *) event, &coords);
priv->move_y = event->y;
priv->move_x = coords.x;
priv->move_y = coords.y;
priv->paging_direction = NONE; priv->paging_direction = NONE;
priv->paging_event_no = 0; priv->paging_event_no = 0;
trough_paging_cb (self); trough_paging_cb (self);
@ -862,7 +871,7 @@ trough_button_release_event_cb (ClutterActor *actor,
{ {
StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (self); StScrollBarPrivate *priv = st_scroll_bar_get_instance_private (self);
if (event->button != 1) if (clutter_event_get_button ((ClutterEvent *) event) != 1)
return FALSE; return FALSE;
g_clear_handle_id (&priv->paging_source_id, g_source_remove); g_clear_handle_id (&priv->paging_source_id, g_source_remove);