3 files changed, 20 insertions, 1 deletions

diff --git a/src/app.h b/src/app.h
index 4d09f5da..4eae7afd 100644
--- a/src/app.h
+++ b/src/app.h
@@ -57,6 +57,10 @@ enum iUserEventCode {
     command_UserEventCode = 1,
     refresh_UserEventCode = 2,
     asleep_UserEventCode = 3,
+    /* The start of a potential touch tap event is notified via a custom event because
+       sending SDL_MOUSEBUTTONDOWN would be premature: we don't know how long the tap will
+       take, it could turn into a tap-and-hold for example. */
+    widgetTapBegins_UserEventCode = 4,
 };
 
 const iString *execPath_App     (void);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 84e9ebfe..c3a6d40d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2602,8 +2602,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             updateHover_DocumentWidget_(d, mpos);
         }
     }
-    if (ev->type == SDL_MOUSEBUTTONDOWN) {
+    if (ev->type == SDL_USEREVENT && ev->user.code == widgetTapBegins_UserEventCode) {
         iChangeFlags(d->flags, noHoverWhileScrolling_DocumentWidgetFlag, iFalse);
+        return iTrue;
+    }
+    if (ev->type == SDL_MOUSEBUTTONDOWN) {
         if (ev->button.button == SDL_BUTTON_X1) {
             postCommand_App("navigate.back");
             return iTrue;
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 68c493dc..bf217301 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -209,6 +209,17 @@ static void dispatchButtonUp_Touch_(iFloat3 pos) {
     });
 }
 
+static void dispatchNotification_Touch_(const iTouch *d, int code) {
+    if (d->affinity) {
+        dispatchEvent_Widget(d->affinity, (SDL_Event *) &(SDL_UserEvent){
+            .type = SDL_USEREVENT,
+            .timestamp = SDL_GetTicks(),
+            .code = code,
+            .data1 = d->affinity
+        });
+    }
+}
+
 static void update_TouchState_(void *ptr) {
     iTouchState *d = ptr;
     const uint32_t nowTime = SDL_GetTicks();
@@ -226,6 +237,7 @@ static void update_TouchState_(void *ptr) {
             }
             if (elapsed > 50 && !touch->isTapBegun) {
                 /* Looks like a possible tap. */
+                dispatchNotification_Touch_(touch, widgetTapBegins_UserEventCode);
                 dispatchMotion_Touch_(touch->pos[0], 0);
                 touch->isTapBegun = iTrue;
             }