6 files changed, 90 insertions, 67 deletions

diff --git a/src/app.c b/src/app.c
index 9e00c408..f1ba2432 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1692,7 +1692,7 @@ iBool handleCommand_App(const char *cmd) {
         }
         setInitialScroll_DocumentWidget(doc, argfLabel_Command(cmd, "scroll"));
         setRedirectCount_DocumentWidget(doc, redirectCount);
-        setFlags_Widget(findWidget_App("document.progress"), hidden_WidgetFlag, iTrue);
+        showCollapsed_Widget(findWidget_App("document.progress"), iFalse);
         if (prefs_App()->decodeUserVisibleURLs) {
             urlDecodePath_String(url);
         }
@@ -1920,12 +1920,11 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "feeds.update.started")) {
-        setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iFalse);
-        postRefresh_App();
+        showCollapsed_Widget(findWidget_App("feeds.progress"), iTrue);
         return iFalse;
     }
     else if (equal_Command(cmd, "feeds.update.finished")) {
-        setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iTrue);
+        showCollapsed_Widget(findWidget_App("feeds.progress"), iFalse);
         refreshFinished_Feeds();
         postRefresh_App();
         return iFalse;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 5d3aa3ba..a7666865 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -836,7 +836,7 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
 static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
     iLabelWidget *prog   = findWidget_App("document.progress");
     const size_t  dlSize = d->request ? bodySize_GmRequest(d->request) : 0;
-    setFlags_Widget(as_Widget(prog), hidden_WidgetFlag, dlSize < 250000);
+    showCollapsed_Widget(as_Widget(prog), dlSize >= 250000);
     if (isVisible_Widget(prog)) {
         updateText_LabelWidget(prog,
                                collectNewFormat_String("%s%.3f MB",
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index 29ae0fee..b68d4a23 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -385,11 +385,13 @@ void init_LookupWidget(iLookupWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
     setId_Widget(w, "lookup");
-    setFlags_Widget(w, focusable_WidgetFlag | resizeChildren_WidgetFlag, iTrue);
+    setFlags_Widget(w, focusable_WidgetFlag, iTrue);
 #if defined (iPlatformAppleMobile)
     setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
 #endif
-    d->list = addChild_Widget(w, iClob(new_ListWidget()));
+    d->list = addChildFlags_Widget(w, iClob(new_ListWidget()),
+                                   resizeToParentWidth_WidgetFlag |
+                                   resizeToParentHeight_WidgetFlag);
     d->cursor = iInvalidPos;
     d->work = new_Thread(worker_LookupWidget_);
     setUserData_Thread(d->work, d);
@@ -428,7 +430,7 @@ void submit_LookupWidget(iLookupWidget *d, const iString *term) {
             signal_Condition(&d->jobAvailable);
         }
         else {
-            setFlags_Widget(as_Widget(d), hidden_WidgetFlag, iTrue);
+            showCollapsed_Widget(as_Widget(d), iFalse);
         }
     });
 }
@@ -597,7 +599,7 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
     scrollOffset_ListWidget(d->list, 0);
     updateVisible_ListWidget(d->list);
     invalidate_ListWidget(d->list);
-    setFlags_Widget(as_Widget(d), hidden_WidgetFlag, numItems_ListWidget(d->list) == 0);
+    showCollapsed_Widget(as_Widget(d), numItems_ListWidget(d->list) != 0);
 }
 
 static iLookupItem *item_LookupWidget_(iLookupWidget *d, size_t index) {
@@ -674,7 +676,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
     }
     if (equal_Command(cmd, "input.ended") && equal_Rangecc(range_Command(cmd, "id"), "url") &&
         !isFocused_Widget(w)) {
-        setFlags_Widget(w, hidden_WidgetFlag, iTrue);
+        showCollapsed_Widget(w, iFalse);
     }
     if (isCommand_Widget(w, ev, "focus.lost")) {
         setCursor_LookupWidget_(d, iInvalidPos);
@@ -689,7 +691,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         const iLookupItem *item = constItem_ListWidget(d->list, arg_Command(cmd));
         if (item && !isEmpty_String(&item->command)) {
             setText_InputWidget(url, url_DocumentWidget(document_App()));
-            setFlags_Widget(w, hidden_WidgetFlag, iTrue);
+            showCollapsed_Widget(w, iFalse);
             setCursor_LookupWidget_(d, iInvalidPos);
             postCommandString_App(&item->command);
             postCommand_App("focus.set id:"); /* unfocus */
@@ -703,7 +705,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
             iWidget *url = findWidget_App("url");
             switch (key) {
                 case SDLK_ESCAPE:
-                    setFlags_Widget(w, hidden_WidgetFlag, iTrue);
+                    showCollapsed_Widget(w, iFalse);
                     setCursor_LookupWidget_(d, iInvalidPos);
                     setFocus_Widget(url);
                     return iTrue;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 3c9edccb..19546235 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -209,6 +209,16 @@ void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
     d->padding[3] = bottom;
 }
 
+void showCollapsed_Widget(iWidget *d, iBool show) {
+    const iBool isVisible = !(d->flags & hidden_WidgetFlag);
+    if ((isVisible && !show) || (!isVisible && show)) {
+        setFlags_Widget(d, hidden_WidgetFlag, !show);
+        /* The entire UI may be affected, if parents are resized due to the (un)collapsing. */
+        arrange_Widget(get_Window()->root);
+        postRefresh_App();
+    }
+}
+
 void setVisualOffset_Widget(iWidget *d, int value, uint32_t span, int animFlags) {
     setFlags_Widget(d, visualOffset_WidgetFlag, iTrue);
     if (span == 0) {
@@ -349,36 +359,37 @@ void arrange_Widget(iWidget *d) {
     if (!d->children) {
         return;
     }
-    /* Resize children to fill the parent widget. */
     const size_t childCount = numArrangedChildren_Widget_(d);
+    /* There may still be unarranged children that need arranging internally. */
     if (childCount == 0) {
+        iForEach(ObjectList, i, d->children) {
+            iWidget *child = as_Widget(i.object);
+            if (isArranged_Widget_(child)) {
+                arrange_Widget(child);
+            }
+        }
         return;
     }
+    /* Resize children to fill the parent widget. */
     if (d->flags & resizeChildren_WidgetFlag) {
         const iInt2 dirs = init_I2((d->flags & resizeWidthOfChildren_WidgetFlag) != 0,
                                    (d->flags & resizeHeightOfChildren_WidgetFlag) != 0);
         /* Collapse hidden children. */
-        iBool uncollapsed = iFalse;
+        iBool collapseChanged = iFalse;
         iForEach(ObjectList, c, d->children) {
             iWidget *child = as_Widget(c.object);
-            if (isCollapsed_Widget_(child)) {
-                if (d->flags & arrangeHorizontal_WidgetFlag) {
-                    setWidth_Widget_(child, 0);
-                }
-                if (d->flags & arrangeVertical_WidgetFlag) {
-                    setHeight_Widget_(child, 0);
-                }
-            }
-            else if (child->flags & wasCollapsed_WidgetFlag) {
+            if (!isCollapsed_Widget_(child) && child->flags & wasCollapsed_WidgetFlag) {
                 setFlags_Widget(child, wasCollapsed_WidgetFlag, iFalse);
                 /* Undo collapse and determine the normal size again. */
-                if (child->flags & arrangeSize_WidgetFlag) {
-                    arrange_Widget(d);
-                    uncollapsed = iTrue;
-                }
+                arrange_Widget(d);
+                collapseChanged = iTrue;
+            }
+            else if (isCollapsed_Widget_(child) && ~child->flags & wasCollapsed_WidgetFlag) {
+                setFlags_Widget(child, wasCollapsed_WidgetFlag, iTrue);
+                collapseChanged = iTrue;
             }
         }
-        if (uncollapsed) {
+        if (collapseChanged) {
             arrange_Widget(d); /* Redo with the new child sizes. */
             return;
         }
@@ -436,7 +447,7 @@ void arrange_Widget(iWidget *d) {
             }
             iForEach(ObjectList, i, d->children) {
                 iWidget *child = as_Widget(i.object);
-                if (isArranged_Widget_(child)) {
+                if (isArranged_Widget_(child) && ~child->flags & parentCannotResize_WidgetFlag) {
                     if (dirs.x) setWidth_Widget_(child, child->flags & unpadded_WidgetFlag ? unpaddedChildSize.x : childSize.x);
                     if (dirs.y) setHeight_Widget_(child, child->flags & unpadded_WidgetFlag ? unpaddedChildSize.y : childSize.y);
                 }
@@ -446,8 +457,9 @@ void arrange_Widget(iWidget *d) {
     if (d->flags & resizeChildrenToWidestChild_WidgetFlag) {
         const int widest = widestChild_Widget_(d);
         iForEach(ObjectList, i, d->children) {
-            if (isArranged_Widget_(i.object)) {
-                setWidth_Widget_(as_Widget(i.object), widest);
+            iWidget *child = as_Widget(i.object);
+            if (isArranged_Widget_(child) && ~child->flags & parentCannotResize_WidgetFlag) {
+                setWidth_Widget_(child, widest);
             }
         }
     }
@@ -505,6 +517,10 @@ void arrange_Widget(iWidget *d) {
                     arrange_Widget(child);
                 }
             }
+            if (d->flags & moveToParentRightEdge_WidgetFlag) {
+                /* TODO: Fix this: not DRY. See beginning of method. */
+                d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
+            }
         }
         if (d->flags & arrangeHeight_WidgetFlag) {
             setHeight_Widget_(d, bounds.size.y);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index a00bb3b7..8dc51a1f 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -216,7 +216,8 @@ void    setPos_Widget               (iWidget *, iInt2 pos);
 void    setSize_Widget              (iWidget *, iInt2 size);
 void    setPadding_Widget           (iWidget *, int left, int top, int right, int bottom);
 iLocalDef void setPadding1_Widget   (iWidget *d, int padding) { setPadding_Widget(d, padding, padding, padding, padding); }
-void    setVisualOffset_Widget      (iWidget *d, int value, uint32_t span, int animFlags);
+void    setVisualOffset_Widget      (iWidget *, int value, uint32_t span, int animFlags);
+void    showCollapsed_Widget        (iWidget *, iBool show); /* takes care of rearranging, refresh */
 void    setBackgroundColor_Widget   (iWidget *, int bgColor);
 void    setFrameColor_Widget        (iWidget *, int frameColor);
 void    setCommandHandler_Widget    (iWidget *, iBool (*handler)(iWidget *, const char *));
diff --git a/src/ui/window.c b/src/ui/window.c
index edbbf0e9..554dc592 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -519,8 +519,9 @@ static iBool willPerformSearchQuery_(const iString *userInput) {
 
 static void showSearchQueryIndicator_(iBool show) {
     iWidget *indicator = findWidget_App("input.indicator.search");
-    setFlags_Widget(indicator, hidden_WidgetFlag, !show);
-    iInputWidget *url = (iInputWidget *) parent_Widget(indicator);
+    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));
 }
@@ -857,17 +858,19 @@ static void updateMetrics_Window_(iWindow *d) {
     iWidget *navBar    = findChild_Widget(d->root, "navbar");
     iWidget *lock      = findChild_Widget(navBar, "navbar.lock");
     iWidget *url       = findChild_Widget(d->root, "url");
-    iWidget *fprog     = findChild_Widget(navBar, "feeds.progress");
-    iWidget *docProg   = findChild_Widget(navBar, "document.progress");
-    iWidget *indSearch = findChild_Widget(navBar, "input.indicator.search");
+//    iWidget *fprog     = findChild_Widget(navBar, "feeds.progress");
+//    iWidget *docProg   = findChild_Widget(navBar, "document.progress");
+//    iWidget *indSearch = findChild_Widget(navBar, "input.indicator.search");
+    iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed");
     setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI);
     navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */
     updateSize_LabelWidget((iLabelWidget *) lock);
     setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
                                   width_Widget(lock) * 0.75);
-    fprog->rect.pos.y = gap_UI;
-    docProg->rect.pos.y = gap_UI;
-    indSearch->rect.pos.y = gap_UI;
+    rightEmbed->rect.pos.y = gap_UI;
+//    fprog->rect.pos.y = gap_UI;
+//    docProg->rect.pos.y = gap_UI;
+//    indSearch->rect.pos.y = gap_UI;
     updatePadding_Window_(d);
     arrange_Widget(d->root);
     postRefresh_App();
@@ -968,52 +971,54 @@ static void setupUserInterface_Window(iWindow *d) {
                 noBackground_WidgetFlag | frameless_WidgetFlag | unpadded_WidgetFlag |
                 (deviceType_App() == desktop_AppDeviceType ? tight_WidgetFlag : 0);
             /* Page information/certificate warning. */ {
-                iLabelWidget *lock =
-                    addChildFlags_Widget(as_Widget(url),
-                                         iClob(newIcon_LabelWidget("\U0001f513", SDLK_i, KMOD_PRIMARY, "document.info")),
-                                         embedFlags | moveToParentLeftEdge_WidgetFlag);
+                iLabelWidget *lock = addChildFlags_Widget(
+                    as_Widget(url),
+                    iClob(newIcon_LabelWidget("\U0001f513", SDLK_i, KMOD_PRIMARY, "document.info")),
+                    embedFlags | moveToParentLeftEdge_WidgetFlag);
                 setId_Widget(as_Widget(lock), "navbar.lock");
                 setFont_LabelWidget(lock, defaultSymbols_FontId);
                 updateTextCStr_LabelWidget(lock, "\U0001f512");
             }
+            iWidget *rightEmbed = new_Widget();
+            setId_Widget(rightEmbed, "url.rightembed");
+            addChildFlags_Widget(as_Widget(url),
+                                 iClob(rightEmbed),
+                                 arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag |
+                                     resizeHeightOfChildren_WidgetFlag |
+                                     moveToParentRightEdge_WidgetFlag);
+            /* Feeds refresh indicator is inside the input field. */ {
+                iLabelWidget *queryInd =
+                    new_LabelWidget(uiTextAction_ColorEscape "\u21d2 Search Query", NULL);
+                setId_Widget(as_Widget(queryInd), "input.indicator.search");
+                setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
+                setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
+                setAlignVisually_LabelWidget(queryInd, iTrue);
+                addChildFlags_Widget(rightEmbed,
+                                     iClob(queryInd),
+                                     collapse_WidgetFlag | hidden_WidgetFlag);
+            }
             /* Feeds refresh indicator is inside the input field. */ {
                 iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
-                                                      "\u2605 Refreshing Feeds...", NULL);
+                                                      "\u2605 Updating Feeds", NULL);
                 setId_Widget(as_Widget(fprog), "feeds.progress");
                 setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
                 setAlignVisually_LabelWidget(fprog, iTrue);
-//                shrink_Rect(&as_Widget(fprog)->rect, init_I2(0, gap_UI));
-                addChildFlags_Widget(as_Widget(url),
+                addChildFlags_Widget(rightEmbed,
                                      iClob(fprog),
-                                     moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
+                                     collapse_WidgetFlag | hidden_WidgetFlag);
             }
-            /* Download progress indicator is also inside the input field, but hidden normally.
-               TODO: It shouldn't overlap the feeds indicator... */ {
+            /* Download progress indicator is also inside the input field, but hidden normally. */ {
                 iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", NULL);
                 setId_Widget(as_Widget(progress), "document.progress");
                 setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
                 setAlignVisually_LabelWidget(progress, iTrue);
-//                shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
-                addChildFlags_Widget(as_Widget(url),
-                                     iClob(progress),
-                                     moveToParentRightEdge_WidgetFlag);
-            }
-            /* Feeds refresh indicator is inside the input field. */ {
-                iLabelWidget *queryInd =
-                    new_LabelWidget(uiTextAction_ColorEscape "\u21d2 Search Query", NULL);
-                setId_Widget(as_Widget(queryInd), "input.indicator.search");
-                setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
-                setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
-                setAlignVisually_LabelWidget(queryInd, iTrue);
-//                shrink_Rect(&as_Widget(queryInd)->rect, init_I2(0, gap_UI));
-                addChildFlags_Widget(as_Widget(url),
-                                     iClob(queryInd),
-                                     moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
+                addChildFlags_Widget(
+                    rightEmbed, iClob(progress), collapse_WidgetFlag);
             }
             /* Reload button. */
             iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
             setId_Widget(as_Widget(reload), "reload");
-            addChildFlags_Widget(as_Widget(url), iClob(reload), embedFlags | moveToParentRightEdge_WidgetFlag);
+            addChildFlags_Widget(rightEmbed, iClob(reload), embedFlags);
             updateSize_LabelWidget(reload);
         }
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);