Fixed clicking on tabs when banner is underneath

Banner was too eager to eat all mouse events.

2 files changed, 21 insertions, 0 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index ffd91f7f..020373e4 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,9 @@
 ```
 # Release notes
 
+## 1.8.3
+* Fixed clicking on UI elements that are over the page top banner. The banner would always get clicked instead.
+
 ## 1.8.2
 * Fixed encoding of `+` characters in URLs as per RFC 3986.
 * Fixed crash when fontpack.ini specifies a file that cannot be found.
diff --git a/src/ui/banner.c b/src/ui/banner.c
index 0ffb1d9f..7168f4b2 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -257,8 +257,26 @@ static size_t itemAtCoord_Banner_(const iBanner *d, iInt2 coord) {
     return iInvalidPos;
 }
 
+static iBool isInside_Banner(const iBanner *d, const SDL_Event *ev) {
+    if (ev->type == SDL_MOUSEMOTION || ev->type == SDL_MOUSEBUTTONDOWN ||
+        ev->type == SDL_MOUSEBUTTONDOWN) {
+        iInt2 coord;
+        if (ev->type == SDL_MOUSEMOTION) {
+            coord = init_I2(ev->motion.x, ev->motion.y);
+        }
+        else {
+            coord = init_I2(ev->button.x, ev->button.y);
+        }
+        return contains_Rect(bounds_Widget(constAs_Widget(d->doc)), coord);
+    }
+    return iTrue;
+}
+
 iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d->doc);
+    if (!isInside_Banner(d, ev)) {
+        return iFalse;
+    }
     switch (ev->type) {
         case SDL_MOUSEMOTION: {
             const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);