Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-emulated-scroll-events' into 'main'

Browse Source 
Drop pointer_emulated discrete scroll events

See merge request GNOME/gtk!4694
This commit is contained in:
Luca Bacci
2022-05-24 15:26:24 +00:00
parent c0d79aa1ef 7752467847
commit 9bfc89e23d
6 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/broadway/gdkeventsource.c
View File

@@ -189,8 +189,7 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
message->pointer.state,
message->scroll.dir == 0
? GDK_SCROLL_UP
: GDK_SCROLL_DOWN,
FALSE);
: GDK_SCROLL_DOWN);
node = _gdk_event_queue_append (display, event);
_gdk_windowing_got_event (display, node, event, message->base.serial);

12
gdk/gdkevents.c
View File

@@ -920,14 +920,6 @@ gdk_event_get_pointer_emulated (GdkEvent *event)
return tevent->pointer_emulated;
}
case GDK_SCROLL:
case GDK_SCROLL_SMOOTH:
{
GdkScrollEvent *sevent = (GdkScrollEvent *) event;
return sevent->pointer_emulated;
}
default:
break;
}
@@ -2373,15 +2365,13 @@ gdk_scroll_event_new_discrete (GdkSurface *surface,
GdkDeviceTool *tool,
guint32 time,
GdkModifierType state,
GdkScrollDirection direction,
gboolean emulated)
GdkScrollDirection direction)
{
GdkScrollEvent *self = gdk_event_alloc (GDK_SCROLL, surface, device, time);
self->tool = tool != NULL ? g_object_ref (tool) : NULL;
self->state = state;
self->direction = direction;
self->pointer_emulated = emulated;
self->unit = GDK_SCROLL_UNIT_WHEEL;
return (GdkEvent *) self;

6
gdk/gdkeventsprivate.h
View File

@@ -206,8 +206,6 @@ struct _GdkTouchEvent
* %GDK_SCROLL_SMOOTH).
* @delta_x: the x coordinate of the scroll delta
* @delta_y: the y coordinate of the scroll delta
* @pointer_emulated: whether the scroll event was the result of
* a pointer emulation
* @tool: a `GdkDeviceTool`
* @history: (element-type GdkTimeCoord): array of times and deltas
* for other scroll events that were compressed before delivering the
@@ -231,7 +229,6 @@ struct _GdkScrollEvent
GdkScrollDirection direction;
double delta_x;
double delta_y;
gboolean pointer_emulated;
gboolean is_stop;
GdkDeviceTool *tool;
GArray *history; /* <GdkTimeCoord> */
@@ -496,8 +493,7 @@ GdkEvent * gdk_scroll_event_new_discrete (GdkSurface *surface,
GdkDeviceTool *tool,
guint32 time,
GdkModifierType state,
GdkScrollDirection direction,
gboolean emulated);
GdkScrollDirection direction);
GdkEvent * gdk_touch_event_new (GdkEventType type,
GdkEventSequence *sequence,

3
gdk/macos/gdkmacosdisplay-translate.c
View File

@@ -700,8 +700,7 @@ fill_scroll_event (GdkMacosDisplay *self,
NULL,
get_time_from_ns_event (nsevent),
state,
direction,
FALSE);
direction);
}
if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled)

14
gdk/wayland/gdkdevice-wayland.c
View File

@@ -1394,8 +1394,7 @@ flush_discrete_scroll_event (GdkWaylandSeat *seat,
NULL,
seat->pointer_info.time,
device_get_modifiers (seat->logical_pointer),
direction,
TRUE);
direction);
_gdk_wayland_display_deliver_event (seat->display, event);
}
@@ -3999,17 +3998,6 @@ tablet_tool_handle_wheel (void *data,
GDK_SCROLL_UNIT_WHEEL);
_gdk_wayland_display_deliver_event (seat->display, event);
/* Send discrete event */
event = gdk_scroll_event_new_discrete (tablet->pointer_info.focus,
tablet->stylus_device,
tablet->current_tool->tool,
tablet->pointer_info.time,
device_get_modifiers (tablet->logical_device),
clicks > 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP,
TRUE);
_gdk_wayland_display_deliver_event (seat->display, event);
}
static void

6
gdk/x11/gdkdevicemanager-xi2.c
View File

@@ -1655,8 +1655,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
NULL,
xev->time,
_gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group),
direction,
FALSE);
direction);
}
else
@@ -1758,8 +1757,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
NULL,
xev->time,
state,
direction,
FALSE);
direction);
}
else
{