7 files changed, 91 insertions, 21 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 466169fc..b2f2e236 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -722,7 +722,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             const int wrapAvail = d->size.x - run.bounds.pos.x - rightMargin * gap_Text;
             const int avail = isWordWrapped ? wrapAvail : 0;
             const char *contPos;
-            const iInt2 dims  = tryAdvance_Text(run.font, runLine, avail, &contPos);
+            const iInt2 dims = tryAdvance_Text(run.font, runLine, avail, &contPos);
             iChangeFlags(run.flags, wide_GmRunFlag, (isPreformat && dims.x > d->size.x));
             run.bounds.size.x = iMax(wrapAvail, dims.x); /* Extends to the right edge for selection. */
             run.bounds.size.y = dims.y;
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 22dd4c92..0fd80ca5 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -104,6 +104,7 @@ struct Impl_InputWidget {
     enum iInputMode mode;
     int             inFlags;
     size_t          maxLen;
+    size_t          maxLayoutLines;
     iArray          text;    /* iChar[] */
     iArray          oldText; /* iChar[] */
     iArray          lines;
@@ -162,7 +163,8 @@ iLocalDef iInt2 padding_(void) {
 }
 
 static iRect contentBounds_InputWidget_(const iInputWidget *d) {
-    const iWidget *w      = constAs_Widget(d);
+    const iWidget *w         = constAs_Widget(d);
+    const iRect widgetBounds = bounds_Widget(w);
     iRect          bounds = adjusted_Rect(bounds_Widget(w),
                                           addX_I2(padding_(), d->leftPadding),
                                           neg_I2(addX_I2(padding_(), d->rightPadding)));
@@ -233,7 +235,12 @@ static void updateLines_InputWidget_(iInputWidget *d) {
     const int wrapWidth = contentBounds_InputWidget_(d).size.x;
     while (wrapWidth > 0 && content.end != content.start) {
         const char *endPos;
-        tryAdvance_Text(d->font, content, wrapWidth, &endPos);
+        if (d->inFlags & isUrl_InputWidgetFlag) {
+            tryAdvanceNoWrap_Text(d->font, content, wrapWidth, &endPos);
+        }
+        else {
+            tryAdvance_Text(d->font, content, wrapWidth, &endPos);
+        }
         const iRangecc part = (iRangecc){ content.start, endPos };
         iInputLine line;
         init_InputLine(&line);
@@ -256,15 +263,19 @@ static void updateLines_InputWidget_(iInputWidget *d) {
     updateCursorLine_InputWidget_(d);
 }
 
-static int contentHeight_InputWidget_(const iInputWidget *d) {
-    return iMax(1, size_Array(&d->lines)) * lineHeight_Text(d->font);
+static int contentHeight_InputWidget_(const iInputWidget *d, iBool forLayout) {
+    size_t numLines = iMax(1, size_Array(&d->lines));
+    if (forLayout) {
+        numLines = iMin(numLines, d->maxLayoutLines);
+    }
+    return numLines * lineHeight_Text(d->font);
 }
 
 static void updateMetrics_InputWidget_(iInputWidget *d) {
     iWidget *w = as_Widget(d);
     updateSizeForFixedLength_InputWidget_(d);
     /* Caller must arrange the width, but the height is fixed. */
-    w->rect.size.y = contentHeight_InputWidget_(d) + 3 * padding_().y; /* TODO: Why 3x? */
+    w->rect.size.y = contentHeight_InputWidget_(d, iTrue) + 3 * padding_().y; /* TODO: Why 3x? */
     if (flags_Widget(w) & extraPadding_WidgetFlag) {
         w->rect.size.y += 2 * gap_UI;
     }
@@ -276,6 +287,7 @@ static void updateLinesAndResize_InputWidget_(iInputWidget *d) {
     const size_t oldCount = size_Array(&d->lines);
     updateLines_InputWidget_(d);
     if (oldCount != size_Array(&d->lines)) {
+        d->click.minHeight = contentHeight_InputWidget_(d, iFalse);
         updateMetrics_InputWidget_(d);
     }
 }
@@ -303,6 +315,7 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     d->inFlags      = eatEscape_InputWidgetFlag;
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
+    d->maxLayoutLines = iInvalidSize;
     setFlags_Widget(w, fixedHeight_WidgetFlag, iTrue);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     d->timer = 0;
@@ -405,6 +418,11 @@ void setMaxLen_InputWidget(iInputWidget *d, size_t maxLen) {
     updateSizeForFixedLength_InputWidget_(d);
 }
 
+void setMaxLayoutLines_InputWidget(iInputWidget *d, size_t maxLayoutLines) {
+    d->maxLayoutLines = maxLayoutLines;
+    updateMetrics_InputWidget_(d);
+}
+
 void setHint_InputWidget(iInputWidget *d, const char *hintText) {
     /* Keep original for retranslations. */
     setCStr_String(&d->srcHint, hintText);
@@ -532,7 +550,7 @@ void begin_InputWidget(iInputWidget *d) {
     }
     updateCursorLine_InputWidget_(d);
     SDL_StartTextInput();
-    setFlags_Widget(w, selected_WidgetFlag, iTrue);
+    setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag, iTrue);
     showCursor_InputWidget_(d);
     refresh_Widget(w);
     d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);
@@ -560,7 +578,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
     SDL_RemoveTimer(d->timer);
     d->timer = 0;
     SDL_StopTextInput();
-    setFlags_Widget(w, selected_WidgetFlag, iFalse);
+    setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag, iFalse);
     const char *id = cstr_String(id_Widget(as_Widget(d)));
     if (!*id) id = "_";
     updateLinesAndResize_InputWidget_(d);
@@ -866,6 +884,20 @@ static void extendRange_InputWidget_(iInputWidget *d, size_t *pos, int dir) {
     }
 }
 
+static iRect bounds_InputWidget_(const iInputWidget *d) {
+    const iWidget *w = constAs_Widget(d);
+    iRect bounds = bounds_Widget(w);
+    if (!isFocused_Widget(d)) {
+        return bounds;
+    }
+    bounds.size.y = contentHeight_InputWidget_(d, iFalse) + 3 * padding_().y;
+    return bounds;
+}
+
+static iBool contains_InputWidget_(const iInputWidget *d, iInt2 coord) {
+    return contains_Rect(bounds_InputWidget_(d), coord);
+}
+
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isCommand_Widget(w, ev, "focus.gained")) {
@@ -925,8 +957,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         copy_InputWidget_(d, iFalse);
         return iTrue;
     }
-    if (ev->type == SDL_MOUSEMOTION && isHover_Widget(d)) {
-        const iInt2 inner = windowToInner_Widget(w, init_I2(ev->motion.x, ev->motion.y));
+    if (ev->type == SDL_MOUSEMOTION && (isHover_Widget(d) || flags_Widget(w) & keepOnTop_WidgetFlag)) {
+        const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);
+        const iInt2 inner = windowToInner_Widget(w, coord);
         setCursor_Window(get_Window(),
                          inner.x >= 2 * gap_UI + d->leftPadding &&
                          inner.x < width_Widget(w) - d->rightPadding
@@ -976,6 +1009,12 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             d->inFlags &= ~isMarking_InputWidgetFlag;
             return iTrue;
     }
+    if (ev->type == SDL_MOUSEMOTION && flags_Widget(w) & keepOnTop_WidgetFlag) {
+        const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);
+        if (contains_Click(&d->click, coord)) {
+            return iTrue;
+        }
+    }
     if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT &&
         contains_Widget(w, init_I2(ev->button.x, ev->button.y))) {
         iWidget *clipMenu = findWidget_App("clipmenu");
@@ -1193,11 +1232,11 @@ static iBool isWhite_(const iString *str) {
 
 static void draw_InputWidget_(const iInputWidget *d) {
     const iWidget *w         = constAs_Widget(d);
-    iRect          bounds    = adjusted_Rect(bounds_Widget(w), padding_(), neg_I2(padding_()));
+    iRect          bounds    = adjusted_Rect(bounds_InputWidget_(d), padding_(), neg_I2(padding_()));
     iBool          isHint    = iFalse;
     const iBool    isFocused = isFocused_Widget(w);
     const iBool    isHover   = isHover_Widget(w) &&
-                               contains_Widget(w, mouseCoord_Window(get_Window()));
+                               contains_InputWidget_(d, mouseCoord_Window(get_Window()));
     if (d->inFlags & needUpdateBuffer_InputWidgetFlag) {
         updateBuffered_InputWidget_(iConstCast(iInputWidget *, d));
     }
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 86484dcc..a632e230 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -47,6 +47,7 @@ void    setTextCStr_InputWidget (iInputWidget *, const char *cstr);
 void    setFont_InputWidget     (iInputWidget *, int fontId);
 void    setCursor_InputWidget   (iInputWidget *, size_t pos);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
+void    setMaxLayoutLines_InputWidget   (iInputWidget *, size_t maxLayoutLines);
 void    begin_InputWidget       (iInputWidget *);
 void    end_InputWidget         (iInputWidget *, iBool accept);
 void    selectAll_InputWidget   (iInputWidget *);
diff --git a/src/ui/root.c b/src/ui/root.c
index 8db8f7af..6f91b370 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -534,13 +534,17 @@ static iBool willPerformSearchQuery_(const iString *userInput) {
     return !isEmpty_String(&prefs_App()->searchUrl) && !isLikelyUrl_String(userInput);
 }
 
+static void updateUrlInputContentPadding_(iWidget *navBar) {
+    iInputWidget *url = findChild_Widget(navBar, "url");
+    const iWidget *indicators = findChild_Widget(navBar, "url.rightembed");
+    setContentPadding_InputWidget(url, -1,
+                                  width_Widget(indicators));
+}
+
 static void showSearchQueryIndicator_(iBool show) {
     iWidget *indicator = findWidget_App("input.indicator.search");
     showCollapsed_Widget(indicator, show);
-    iAssert(isInstance_Object(parent_Widget(parent_Widget(indicator)), &Class_InputWidget));
-    iInputWidget *url = (iInputWidget *) parent_Widget(parent_Widget(indicator));
-    setContentPadding_InputWidget(url, -1, contentPadding_InputWidget(url).left +
-                                               (show ? width_Widget(indicator) : 0));
+    updateUrlInputContentPadding_(findWidget_Root("navbar"));
 }
 
 static int navBarAvailableSpace_(iWidget *navBar) {
@@ -1008,6 +1012,7 @@ void createUserInterface_Root(iRoot *d) {
             setFlags_Widget(as_Widget(url), resizeHeightOfChildren_WidgetFlag, iTrue);
             setSelectAllOnFocus_InputWidget(url, iTrue);
             setId_Widget(as_Widget(url), "url");
+            setMaxLayoutLines_InputWidget(url, 1);
             setUrlContent_InputWidget(url, iTrue);
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
diff --git a/src/ui/util.c b/src/ui/util.c
index 92cf85b7..f20338b5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -378,10 +378,20 @@ void init_Click(iClick *d, iAnyObject *widget, int button) {
     d->isActive = iFalse;
     d->button   = button;
     d->bounds   = as_Widget(widget);
+    d->minHeight = 0;
     d->startPos = zero_I2();
     d->pos      = zero_I2();
 }
 
+iBool contains_Click(const iClick *d, iInt2 coord) {
+    if (d->minHeight) {
+        iRect rect = bounds_Widget(d->bounds);
+        rect.size.y = iMax(d->minHeight, rect.size.y);
+        return contains_Rect(rect, coord);
+    }
+    return contains_Widget(d->bounds, coord);
+}
+
 enum iClickResult processEvent_Click(iClick *d, const SDL_Event *event) {
     if (event->type == SDL_MOUSEMOTION) {
         const iInt2 pos = init_I2(event->motion.x, event->motion.y);
@@ -403,7 +413,7 @@ enum iClickResult processEvent_Click(iClick *d, const SDL_Event *event) {
     }
     if (!d->isActive) {
         if (mb->state == SDL_PRESSED) {
-            if (contains_Widget(d->bounds, pos)) {
+            if (contains_Click(d, pos)) {
                 d->isActive = iTrue;
                 d->startPos = d->pos = pos;
                 setMouseGrab_Widget(d->bounds);
@@ -413,7 +423,7 @@ enum iClickResult processEvent_Click(iClick *d, const SDL_Event *event) {
     }
     else { /* Active. */
         if (mb->state == SDL_RELEASED) {
-            enum iClickResult result = contains_Widget(d->bounds, pos)
+            enum iClickResult result = contains_Click(d, pos)
                                            ? finished_ClickResult
                                            : aborted_ClickResult;
             d->isActive = iFalse;
@@ -891,6 +901,14 @@ static iBool isTabPage_Widget_(const iWidget *tabs, const iWidget *page) {
     return page && page->parent == findChild_Widget(tabs, "tabs.pages");
 }
 
+static void unfocusFocusInsideTabPage_(const iWidget *page) {
+    iWidget *focus = focus_Widget();
+    if (page && focus && hasParent_Widget(focus, page)) {
+        printf("unfocus inside page: %p\n", focus);
+        setFocus_Widget(NULL);
+    }
+}
+
 static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
     if (equal_Command(cmd, "tabs.switch")) {
         iWidget *target = pointerLabel_Command(cmd, "page");
@@ -898,6 +916,7 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
             target = findChild_Widget(tabs, cstr_Rangecc(range_Command(cmd, "id")));
         }
         if (!target) return iFalse;
+        unfocusFocusInsideTabPage_(currentTabPage_Widget(tabs));
         if (flags_Widget(target) & focusable_WidgetFlag) {
             setFocus_Widget(target);
         }
@@ -915,6 +934,7 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
         }
     }
     else if (equal_Command(cmd, "tabs.next") || equal_Command(cmd, "tabs.prev")) {
+        unfocusFocusInsideTabPage_(currentTabPage_Widget(tabs));
         iWidget *pages = findChild_Widget(tabs, "tabs.pages");
         int tabIndex = 0;
         iConstForEach(ObjectList, i, pages->children) {
@@ -2205,7 +2225,9 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.downloads}")));
         setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.downloads");
 #endif
-        addPrefsInputWithHeading_(headings, values, "prefs.searchurl", iClob(new_InputWidget(0)));
+        iInputWidget *searchUrl;
+        addPrefsInputWithHeading_(headings, values, "prefs.searchurl", iClob(searchUrl = new_InputWidget(0)));
+        setUrlContent_InputWidget(searchUrl, iTrue);
         addChild_Widget(headings, iClob(makePadding_Widget(bigGap)));
         addChild_Widget(values, iClob(makePadding_Widget(bigGap)));
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.collapsepreonload}")));
diff --git a/src/ui/util.h b/src/ui/util.h
index cbedefaa..50845280 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -154,6 +154,7 @@ struct Impl_Click {
     int      button;
     int      count;
     iWidget *bounds;
+    int      minHeight;
     iInt2    startPos;
     iInt2    pos;
 };
@@ -166,6 +167,7 @@ iBool               isMoved_Click       (const iClick *);
 iInt2               pos_Click           (const iClick *);
 iRect               rect_Click          (const iClick *);
 iInt2               delta_Click         (const iClick *);
+iBool               contains_Click      (const iClick *, iInt2 coord);
 
 /*-----------------------------------------------------------------------------------------------*/
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 67ce1345..6412481b 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1035,6 +1035,7 @@ void drawBackground_Widget(const iWidget *d) {
         init_Paint(&p);
         drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
     }
+    
     if (fadeBackground && ~d->flags & noFadeBackground_WidgetFlag) {
         iPaint p;
         init_Paint(&p);
@@ -1131,10 +1132,10 @@ void drawChildren_Widget(const iWidget *d) {
         }
     }
     /* Root draws the on-top widgets on top of everything else. */
-    if (!d->parent) {
+    if (d == d->root->widget) {
         iConstForEach(PtrArray, i, onTop_Root(d->root)) {
             const iWidget *top = *i.value;
-            draw_Widget(top);
+            class_Widget(top)->draw(top);
         }
     }
 }