8 files changed, 32 insertions, 22 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 1e3eb08d..8b4ee932 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -882,7 +882,7 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     if (memcmp(&oldHeading, &newHeading, sizeof(oldHeading))) {
         d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
     }
-    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window()));
+    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
     updateSideOpacity_DocumentWidget_(d, iTrue);
     animateMedia_DocumentWidget_(d);
     /* Remember scroll positions of recently visited pages. */ {
@@ -1806,7 +1806,7 @@ static void togglePreFold_DocumentWidget_(iDocumentWidget *d, uint16_t preId) {
     foldPre_GmDocument(d->doc, preId);
     redoLayout_GmDocument(d->doc);
     clampScroll_DocumentWidget_(d);
-    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window()));
+    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
     invalidate_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
 }
@@ -3123,7 +3123,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "menu.closed")) {
-        updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window()));
+        updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
     }
     else if (equal_Command(cmd, "document.autoreload")) {
         if (d->mod.reloadInterval) {
@@ -3435,7 +3435,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
     }
     else if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
-        const iInt2 mouseCoord = mouseCoord_Window(get_Window());
+        const iInt2 mouseCoord = coord_MouseWheelEvent(&ev->wheel);
         if (isPerPixel_MouseWheelEvent(&ev->wheel)) {
             const iInt2 wheel = init_I2(ev->wheel.x, ev->wheel.y);
             stop_Anim(&d->scrollY.pos);
@@ -3694,7 +3694,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             /* Enable hover state now that scrolling has surely finished. */
             if (d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
                 d->flags &= ~noHoverWhileScrolling_DocumentWidgetFlag;
-                updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window()));
+                updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), ev->button.which));
             }
             if (~flags_Widget(w) & touchDrag_WidgetFlag) {
                 iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iFalse);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 444f849d..525e2a33 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1760,7 +1760,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             closeMenu_Widget(clipMenu);
         }
         else {
-            openMenuFlags_Widget(clipMenu, mouseCoord_Window(get_Window()), iFalse);
+            openMenuFlags_Widget(clipMenu,
+                                 mouseCoord_Window(get_Window(), ev->button.which),
+                                 iFalse);
         }
         return iTrue;
     }
@@ -2058,7 +2060,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
     iBool          isHint    = isHintVisible_InputWidget_(d);
     const iBool    isFocused = isFocused_Widget(w);
     const iBool    isHover   = isHover_Widget(w) &&
-                               contains_InputWidget_(d, mouseCoord_Window(get_Window()));
+                               contains_InputWidget_(d, mouseCoord_Window(get_Window(), 0));
     if (d->inFlags & needUpdateBuffer_InputWidgetFlag) {
         updateBuffered_InputWidget_(iConstCast(iInputWidget *, d));
     }
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 29aa9d1f..46d32e9a 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -283,7 +283,7 @@ static void setHoverItem_ListWidget_(iListWidget *d, size_t index) {
 }
 
 void updateMouseHover_ListWidget(iListWidget *d) {
-    const iInt2 mouse = mouseCoord_Window(get_Window());
+    const iInt2 mouse = mouseCoord_Window(get_Window(), 0);
     setHoverItem_ListWidget_(d, itemIndex_ListWidget(d, mouse));
 }
 
@@ -355,7 +355,7 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     switch (processEvent_Click(&d->click, ev)) {
         case started_ClickResult:
             d->noHoverWhileScrolling = iFalse;
-            updateHover_ListWidget_(d, mouseCoord_Window(get_Window()));
+            updateHover_ListWidget_(d, mouseCoord_Window(get_Window(), ev->button.which));
             redrawHoverItem_ListWidget_(d);
             return iTrue;
         case aborted_ClickResult:
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index 22924876..b622a554 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -62,7 +62,7 @@ void init_PlayerUI(iPlayerUI *d, const iPlayer *player, iRect bounds) {
 }
 
 static void drawPlayerButton_(iPaint *p, iRect rect, const char *label, int font) {
-    const iInt2 mouse     = mouseCoord_Window(get_Window());
+    const iInt2 mouse     = mouseCoord_Window(get_Window(), 0);
     const iBool isHover   = contains_Rect(rect, mouse);
     const iBool isPressed = isHover && (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON_LEFT) != 0;
     const int frame = (isPressed ? uiTextCaution_ColorId : isHover ? uiHeading_ColorId : uiAnnotation_ColorId);
@@ -159,7 +159,7 @@ void draw_PlayerUI(iPlayerUI *d, iPaint *p) {
               dot);
     /* Volume adjustment. */
     if (isAdjusting) {
-        const iInt2 mouse   = mouseCoord_Window(get_Window());
+        const iInt2 mouse   = mouseCoord_Window(get_Window(), 0);
         const iBool isHover = contains_Rect(d->volumeRect, mouse) &&
                               ~flags_Player(d->player) & volumeGrabbed_PlayerFlag;
         const iBool isPressed = (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON_LEFT) != 0;
diff --git a/src/ui/util.c b/src/ui/util.c
index 13a9237e..b6ecc7d5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -64,6 +64,10 @@ const char *command_UserEvent(const SDL_Event *d) {
     return "";
 }
 
+iInt2 coord_MouseWheelEvent(const SDL_MouseWheelEvent *ev) {
+    return mouseCoord_Window(get_Window(), ev->which);
+}
+
 static void removePlus_(iString *str) {
     if (endsWith_String(str, "+")) {
         removeEnd_String(str, 1);
diff --git a/src/ui/util.h b/src/ui/util.h
index 021f72d1..2423f834 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -58,6 +58,8 @@ iLocalDef iBool isPerPixel_MouseWheelEvent(const SDL_MouseWheelEvent *ev) {
     return (ev->direction & perPixel_MouseWheelFlag) != 0;
 }
 
+iInt2   coord_MouseWheelEvent   (const SDL_MouseWheelEvent *);
+
 #if defined (iPlatformApple)
 #   define KMOD_PRIMARY     KMOD_GUI
 #   define KMOD_SECONDARY   KMOD_CTRL
diff --git a/src/ui/window.c b/src/ui/window.c
index f71d8102..4bf42a30 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -957,10 +957,14 @@ iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
             if (isCommand_SDLEvent(ev) && ev->user.data2 && ev->user.data2 != root) {
                 continue; /* Not meant for this root. */
             }
-            else if ((ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP || ev->type == SDL_TEXTINPUT)
+            if ((ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP || ev->type == SDL_TEXTINPUT)
                      && d->keyRoot != root) {
                 continue; /* Key events go only to the root with keyboard focus. */
             }
+            if (ev->type == SDL_MOUSEWHEEL && !contains_Rect(rect_Root(root),
+                                                             coord_MouseWheelEvent(&ev->wheel))) {
+                continue; /* Only process the event in the relevant split. */
+            }
             setCurrent_Root(root);
             const iBool wasUsed = dispatchEvent_Widget(root->widget, ev);
             if (wasUsed) {
@@ -1154,20 +1158,19 @@ iInt2 coord_Window(const iWindow *d, int x, int y) {
     return mulf_I2(init_I2(x, y), d->pixelRatio);
 }
 
-iInt2 mouseCoord_Window(const iWindow *d) {
-#if defined (iPlatformMobile)
-    /* At least on iOS the coordinates returned by SDL_GetMouseState() do no match up with
-       our touch coordinates on the Y axis (?). Maybe a pixel ratio thing? */
-    iUnused(d);
-    return latestPosition_Touch();
-#else
+iInt2 mouseCoord_Window(const iWindow *d, int whichDevice) {
+    if (whichDevice == SDL_TOUCH_MOUSEID) {
+        /* At least on iOS the coordinates returned by SDL_GetMouseState() do no match up with
+           our touch coordinates on the Y axis (?). Maybe a pixel ratio thing? */
+        iUnused(d);
+        return latestPosition_Touch();
+    }
     if (!d->isMouseInside) {
         return init_I2(-1000000, -1000000);
     }
     int x, y;
     SDL_GetMouseState(&x, &y);
     return coord_Window(d, x, y);
-#endif
 }
 
 float uiScale_Window(const iWindow *d) {
diff --git a/src/ui/window.h b/src/ui/window.h
index 677001e5..bb98dbe9 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -126,7 +126,7 @@ iInt2       size_Window             (const iWindow *);
 iInt2       maxTextureSize_Window   (const iWindow *);
 float       uiScale_Window          (const iWindow *);
 iInt2       coord_Window            (const iWindow *, int x, int y);
-iInt2       mouseCoord_Window       (const iWindow *);
+iInt2       mouseCoord_Window       (const iWindow *, int whichDevice);
 iAnyObject *hitChild_Window         (const iWindow *, iInt2 coord);
 uint32_t    frameTime_Window        (const iWindow *);
 SDL_Renderer *renderer_Window       (const iWindow *);
@@ -135,7 +135,6 @@ iBool       isFullscreen_Window     (const iWindow *);
 int         numRoots_Window         (const iWindow *);
 iRoot *     findRoot_Window         (const iWindow *, const iWidget *widget);
 iRoot *     otherRoot_Window        (const iWindow *, iRoot *root);
-
 iWindow *   get_Window              (void);
 
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)