aboutsummaryrefslogtreecommitdiffstats
path: root/src/xwidget.c
diff options
context:
space:
mode:
authorPo Lu2021-12-08 14:18:09 +0800
committerPo Lu2021-12-08 14:18:09 +0800
commit41b1d223c6ab7bca1b626a4c07a4f2dda2855feb (patch)
treec353ea66d42402e91da18fb78a55c4e455c4cba0 /src/xwidget.c
parentbdeb189cf202f9661f783aebd4852b401858958b (diff)
parentbf79dad3f20345ddf095325ce22c0f2a3408d3ba (diff)
downloademacs-41b1d223c6ab7bca1b626a4c07a4f2dda2855feb.tar.gz
emacs-41b1d223c6ab7bca1b626a4c07a4f2dda2855feb.zip
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'src/xwidget.c')
-rw-r--r--src/xwidget.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 749a3220a38..bd64f483377 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -1066,7 +1066,8 @@ xwidget_motion_notify (struct xwidget_view *view,
1066 1066
1067void 1067void
1068xwidget_scroll (struct xwidget_view *view, double x, double y, 1068xwidget_scroll (struct xwidget_view *view, double x, double y,
1069 double dx, double dy, uint state, Time time) 1069 double dx, double dy, uint state, Time time,
1070 bool stop_p)
1070{ 1071{
1071 GdkEvent *xg_event; 1072 GdkEvent *xg_event;
1072 GtkWidget *target; 1073 GtkWidget *target;
@@ -1101,9 +1102,7 @@ xwidget_scroll (struct xwidget_view *view, double x, double y,
1101 xg_event->scroll.delta_x = dx; 1102 xg_event->scroll.delta_x = dx;
1102 xg_event->scroll.delta_y = dy; 1103 xg_event->scroll.delta_y = dy;
1103 xg_event->scroll.device = find_suitable_pointer (view->frame); 1104 xg_event->scroll.device = find_suitable_pointer (view->frame);
1104 1105 xg_event->scroll.is_stop = stop_p;
1105 if (!(fabs (dx) > 0) || !(fabs (dy) > 0))
1106 xg_event->scroll.is_stop = TRUE;
1107 1106
1108 g_object_ref (xg_event->any.window); 1107 g_object_ref (xg_event->any.window);
1109 1108