Banner: Clicking on the site name

3 files changed, 42 insertions, 36 deletions

diff --git a/src/ui/banner.c b/src/ui/banner.c
index 5ec3c9f0..d1ed470c 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -53,6 +53,7 @@ struct Impl_Banner {
     iString site;
     iString icon;
     iArray items;
+    iBool isClick;
 };
 
 iDefineTypeConstruction(Banner)
@@ -70,6 +71,7 @@ void init_Banner(iBanner *d) {
     init_String(&d->site);
     init_String(&d->icon);
     init_Array(&d->items, sizeof(iBannerItem));
+    d->isClick = iFalse;
 }
 
 void deinit_Banner(iBanner *d) {
@@ -96,6 +98,10 @@ int height_Banner(const iBanner *d) {
     return d->rect.size.y;
 }
 
+iBool contains_Banner(const iBanner *d, iInt2 coord) {
+    return contains_Rect(d->rect, coord);
+}
+
 void clear_Banner(iBanner *d) {
     iForEach(Array, i, &d->items) {
         deinit_BannerItem(i.value);
@@ -139,8 +145,36 @@ void remove_Banner(iBanner *d, enum iGmStatusCode code) {
 
 iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d->doc);
-    /* on motion: */
-//    setCursor_Window(window_Widget(w), SDL_SYSTEM_CURSOR_HAND);    
+    switch (ev->type) {
+        case SDL_MOUSEMOTION:
+            if (contains_Rect(d->rect, init_I2(ev->motion.x, ev->motion.y))) {
+                setCursor_Window(window_Widget(w), SDL_SYSTEM_CURSOR_HAND);
+            }
+            break;
+        case SDL_MOUSEBUTTONDOWN:
+        case SDL_MOUSEBUTTONUP:
+            /* Clicking on the top/side banner navigates to site root. */
+            if (ev->button.button == SDL_BUTTON_LEFT) {
+                const iBool isInside = contains_Rect(d->rect, init_I2(ev->button.x, ev->button.y));
+                if (isInside && ev->button.state == SDL_PRESSED) {
+                    d->isClick = iTrue;
+                    return iTrue;
+                }
+                else if (ev->button.state == SDL_RELEASED) {
+                    if (d->isClick && isInside) {
+                        postCommand_Widget(d->doc, "navigate.root");
+                    }
+                    d->isClick = iFalse;
+                }
+                /* Clicking on a warning? */
+//                if (bannerType_DocumentWidget_(d) == certificateWarning_GmDocumentBanner &&
+//                    pos_Click(&d->click).y - top_Rect(banRect) >
+//                    lineHeight_Text(banner_FontId) * 2) {
+//                    postCommand_Widget(d, "document.info");
+//                }
+            }
+            break;
+    }
     return iFalse;
 }
 
diff --git a/src/ui/banner.h b/src/ui/banner.h
index 5ee8b3ae..2ee3a2bc 100644
--- a/src/ui/banner.h
+++ b/src/ui/banner.h
@@ -42,6 +42,7 @@ void    setWidth_Banner     (iBanner *, int width);
 void    setPos_Banner       (iBanner *, iInt2 pos);
 
 int     height_Banner       (const iBanner *);
+iBool   contains_Banner     (const iBanner *, iInt2 coord);
 
 iLocalDef iBool isEmpty_Banner(const iBanner *d) {
     return height_Banner(d) == 0;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 17111ed0..75da67a1 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -342,6 +342,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->media            = new_ObjectList();
     d->doc              = new_GmDocument();
     d->banner           = new_Banner();
+    setOwner_Banner(d->banner, d);
     d->redirectCount    = 0;
     d->ordinalBase      = 0;
     d->initNormScrollY  = 0;
@@ -540,25 +541,10 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
         if (docSize.y < rect.size.y) {
             /* Center vertically if short. There is one empty paragraph line's worth of margin
                between the banner and the page contents. */
-//            const int bannerHeight = 0; //banner ? height_Rect(banner->visBounds) : 0;
-#if 0
-            int offset = iMax(0, (rect.size.y + margin - size_GmDocument(d->doc).y
-                                  //- lineHeight_Text(paragraph_FontId)
-                                  ) / 2 - height_Banner(d->banner)
-                              //-
-                              //documentTopPad_DocumentWidget_(d)
-                              );
-#endif
             int offset = iMax(0, height_Rect(bounds) / 2
-//                              - (isEmpty_Banner(d->banner) ? lineHeight_Text(paragraph_FontId) / 2 : 0)
                               - documentTopPad_DocumentWidget_(d)
-//                              + lineHeight_Text(paragraph_FontId) / 2
-//                              - isEmpty_Banner(d->banner) ?
                               - height_Banner(d->banner)
-                              - size_GmDocument(d->doc).y / 2
-                              );
-                              //(//documentTopPad_DocumentWidget_(d) +
-                               //size_GmDocument(d->doc).y) / 2);
+                              - size_GmDocument(d->doc).y / 2);
             rect.pos.y  = top_Rect(bounds) + offset;
             rect.size.y = docSize.y;
             wasCentered = iTrue;
@@ -594,9 +580,6 @@ static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
 }
 
 static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
-//    const int margin = -documentTopPad_DocumentWidget_(d) +
-//        d->pageMargin * gap_UI;
-    //const int top = -viewPos_DocumentWidget_(d) - margin;
     int top = pos_SmoothScroll(&d->scrollY) - height_Banner(d->banner) - documentTopPad_DocumentWidget_(d);
     if (isEmpty_Banner(d->banner)) {
         /* Top padding is not collapsed. */
@@ -3939,6 +3922,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
     if (processMediaEvents_DocumentWidget_(d, ev)) {
         return iTrue;
     }
+    if (processEvent_Banner(d->banner, ev)) {
+        return iTrue;
+    }
     /* The left mouse button. */
     switch (processEvent_Click(&d->click, ev)) {
         case started_ClickResult:
@@ -4191,21 +4177,6 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     d->selectMark = iNullRange;
                     refresh_Widget(w);
                 }
-#if 0
-                /* Clicking on the top/side banner navigates to site root. */
-                const iRect banRect = siteBannerRect_DocumentWidget_(d);
-                if (contains_Rect(banRect, pos_Click(&d->click))) {
-                    /* Clicking on a warning? */
-                    if (bannerType_DocumentWidget_(d) == certificateWarning_GmDocumentBanner &&
-                        pos_Click(&d->click).y - top_Rect(banRect) >
-                            lineHeight_Text(banner_FontId) * 2) {
-                        postCommand_Widget(d, "document.info");
-                    }
-                    else {
-                        postCommand_Widget(d, "navigate.root");
-                    }
-                }
-#endif
             }
             return iTrue;
         case aborted_ClickResult: