13 files changed, 166 insertions, 61 deletions

diff --git a/src/app.c b/src/app.c
index b1036ffe..35a70f0b 100644
--- a/src/app.c
+++ b/src/app.c
@@ -914,7 +914,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
 #if defined (iPlatformAppleDesktop)
                     handleCommand_MacOS(command_UserEvent(&ev));
 #endif
-                    if (isCommand_UserEvent(&ev, "metrics.changed")) {
+                    if (isMetricsChange_UserEvent(&ev)) {
                         arrange_Widget(d->window->root);
                     }
                     if (!wasUsed) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 242afe30..6972f32d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2246,7 +2246,10 @@ static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t or
 
 static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
-    if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
+    if (isMetricsChange_UserEvent(ev)) {
+        updateSize_DocumentWidget(d);
+    }
+    else if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
         if (!handleCommand_DocumentWidget_(d, command_UserEvent(ev))) {
             /* Base class commands. */
             return processEvent_Widget(w, ev);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index dd8fa744..4b5cd623 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -107,6 +107,24 @@ static void showCursor_InputWidget_(iInputWidget *d) {
     d->cursorVis = 2;
 }
 
+static void invalidateBuffered_InputWidget_(iInputWidget *d) {
+    if (d->buffered) {
+        delete_TextBuf(d->buffered);
+        d->buffered = NULL;
+    }
+}
+
+static void updateMetrics_InputWidget_(iInputWidget *d) {
+    iWidget *w = as_Widget(d);
+    /* Caller must arrange the width, but the height is fixed. */
+    w->rect.size.y = lineHeight_Text(default_FontId) + 2 * gap_UI;
+#if defined (iPlatformAppleMobile)
+    w->rect.size.y += 2 * gap_UI;
+#endif
+    invalidateBuffered_InputWidget_(d);
+    arrange_Widget(w);
+}
+
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
     iWidget *w = &d->widget;
     init_Widget(w);
@@ -115,24 +133,20 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     init_Array(&d->oldText, sizeof(iChar));
     init_String(&d->hint);
     init_Array(&d->undoStack, sizeof(iInputUndo));
-    d->font             = uiInput_FontId | alwaysVariableFlag_FontId;
-    d->leftPadding      = 0;
-    d->rightPadding     = 0;
-    d->cursor           = 0;
-    d->lastCursor       = 0;
-    d->inFlags          = eatEscape_InputWidgetFlag;
+    d->font         = uiInput_FontId | alwaysVariableFlag_FontId;
+    d->leftPadding  = 0;
+    d->rightPadding = 0;
+    d->cursor       = 0;
+    d->lastCursor   = 0;
+    d->inFlags      = eatEscape_InputWidgetFlag;
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
-    /* Caller must arrange the width, but the height is fixed. */
-    w->rect.size.y = lineHeight_Text(default_FontId) + 2 * gap_UI;
-#if defined (iPlatformAppleMobile)
-    w->rect.size.y += 2 * gap_UI;
-#endif
     setFlags_Widget(w, fixedHeight_WidgetFlag, iTrue);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     d->timer = 0;
     d->cursorVis = 0;
     d->buffered = NULL;
+    updateMetrics_InputWidget_(d);
 }
 
 void deinit_InputWidget(iInputWidget *d) {
@@ -226,13 +240,6 @@ static iString *visText_InputWidget_(const iInputWidget *d) {
     return text;
 }
 
-static void invalidateBuffered_InputWidget_(iInputWidget *d) {
-    if (d->buffered) {
-        delete_TextBuf(d->buffered);
-        d->buffered = NULL;
-    }
-}
-
 static void updateBuffered_InputWidget_(iInputWidget *d) {
     invalidateBuffered_InputWidget_(d);
     iString *visText = visText_InputWidget_(d);
@@ -600,6 +607,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iFalse;
     }
+    else if (isMetricsChange_UserEvent(ev)) {
+        updateMetrics_InputWidget_(d);
+    }
     else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
         copy_InputWidget_(d, iFalse);
         return iTrue;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 8cba2d00..87c33562 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -78,7 +78,7 @@ static void updateKey_LabelWidget_(iLabelWidget *d) {
 
 static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
     iWidget *w = &d->widget;
-    if (isCommand_UserEvent(ev, "metrics.changed")) {
+    if (isMetricsChange_UserEvent(ev)) {
         updateSize_LabelWidget(d);
     }
     else if (isCommand_UserEvent(ev, "bindings.changed")) {
@@ -277,8 +277,8 @@ static void sizeChanged_LabelWidget_(iLabelWidget *d) {
     }
 }
 
-void updateSize_LabelWidget(iLabelWidget *d) {
-    iWidget *w = as_Widget(d);
+iInt2 defaultSize_LabelWidget(const iLabelWidget *d) {
+    const iWidget *w = constAs_Widget(d);
     const int64_t flags = flags_Widget(w);
     iInt2 size = add_I2(measure_Text(d->font, cstr_String(&d->label)), muli_I2(padding_(flags), 2));
     if ((flags & drawKey_WidgetFlag) && d->key) {
@@ -288,6 +288,17 @@ void updateSize_LabelWidget(iLabelWidget *d) {
         size.x += 2 * gap_UI + measure_Text(uiShortcuts_FontId, cstr_String(&str)).x;
         deinit_String(&str);
     }
+    return size;
+}
+
+int font_LabelWidget(const iLabelWidget *d) {
+    return d->font;
+}
+
+void updateSize_LabelWidget(iLabelWidget *d) {
+    iWidget *w = as_Widget(d);
+    const int64_t flags = flags_Widget(w);
+    const iInt2 size = defaultSize_LabelWidget(d);
     /* Wrapped text implies that width must be defined by arrangement. */
     if (!(flags & (fixedWidth_WidgetFlag | wrapText_WidgetFlag))) {
         w->rect.size.x = size.x;
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 266c3b02..83dd66e5 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -40,8 +40,10 @@ void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
 
-const iString *text_LabelWidget    (const iLabelWidget *);
-const iString *command_LabelWidget  (const iLabelWidget *);
+iInt2           defaultSize_LabelWidget (const iLabelWidget *);
+int             font_LabelWidget        (const iLabelWidget *);
+const iString * text_LabelWidget        (const iLabelWidget *);
+const iString * command_LabelWidget     (const iLabelWidget *);
 
 iLabelWidget *newKeyMods_LabelWidget(const char *label, int key, int kmods, const char *command);
 iLabelWidget *newColor_LabelWidget  (const char *text, int color);
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index d31ac2f5..2e5519a5 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -278,7 +278,10 @@ static void sizeChanged_ListWidget_(iListWidget *d) {
 
 static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
-    if (isCommand_SDLEvent(ev)) {
+    if (isMetricsChange_UserEvent(ev)) {
+        invalidate_ListWidget(d);        
+    }
+    else if (isCommand_SDLEvent(ev)) {
         const char *cmd = command_UserEvent(ev);
         if (equal_Command(cmd, "theme.changed")) {
             invalidate_ListWidget(d);
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index 7d6052e2..10039e10 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -372,6 +372,10 @@ static iThreadResult worker_LookupWidget_(iThread *thread) {
 
 iDefineObjectConstruction(LookupWidget)
 
+static void updateMetrics_LookupWidget_(iLookupWidget *d) {
+    setItemHeight_ListWidget(d->list, lineHeight_Text(uiContent_FontId) * 1.25f);
+}
+
 void init_LookupWidget(iLookupWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -381,7 +385,6 @@ void init_LookupWidget(iLookupWidget *d) {
     setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
 #endif
     d->list = addChild_Widget(w, iClob(new_ListWidget()));
-    setItemHeight_ListWidget(d->list, lineHeight_Text(uiContent_FontId) * 1.25f);
     d->cursor = iInvalidPos;
     d->work = new_Thread(worker_LookupWidget_);
     setUserData_Thread(d->work, d);
@@ -390,6 +393,7 @@ void init_LookupWidget(iLookupWidget *d) {
     init_String(&d->pendingTerm);
     d->pendingDocs = NULL;
     d->finishedJob = NULL;
+    updateMetrics_LookupWidget_(d);
     start_Thread(d->work);
 }
 
@@ -634,8 +638,11 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         presentResults_LookupWidget_(d);
         return iTrue;
     }
-    if (isResize_UserEvent(ev) || (equal_Command(cmd, "layout.changed") &&
-                                   equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
+    if (isMetricsChange_UserEvent(ev)) {
+        updateMetrics_LookupWidget_(d);
+    }
+    else if (isResize_UserEvent(ev) || (equal_Command(cmd, "layout.changed") &&
+                                        equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
         /* Position the lookup popup under the URL bar. */ {
             const iWindow *window = get_Window();
             const iInt2 rootSize = rootSize_Window(window);
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 448103b5..e1893fec 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -35,6 +35,10 @@ struct Impl_ScrollWidget {
     int startThumb;
 };
 
+static void updateMetrics_ScrollWidget_(iScrollWidget *d) {
+    as_Widget(d)->rect.size.x = gap_UI * 3;
+}
+
 void init_ScrollWidget(iScrollWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -43,7 +47,7 @@ void init_ScrollWidget(iScrollWidget *d) {
                     fixedWidth_WidgetFlag | resizeToParentHeight_WidgetFlag |
                         moveToParentRightEdge_WidgetFlag | touchDrag_WidgetFlag,
                     iTrue);
-    w->rect.size.x = gap_UI * 3;
+    updateMetrics_ScrollWidget_(d);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
 }
 
@@ -88,6 +92,9 @@ void setThumb_ScrollWidget(iScrollWidget *d, int thumb, int thumbSize) {
 
 static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+    if (isMetricsChange_UserEvent(ev)) {
+        updateMetrics_ScrollWidget_(d);
+    }
     switch (processEvent_Click(&d->click, ev)) {
         case started_ClickResult:
             setFlags_Widget(w, pressed_WidgetFlag, iTrue);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 4d3818bd..dd7b977e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -414,8 +414,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
 }
 
 static void updateItemHeight_SidebarWidget_(iSidebarWidget *d) {
-    const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
-    setItemHeight_ListWidget(d->list, heights[d->mode] * lineHeight_Text(d->itemFonts[0]));
+    if (d->list) {
+        const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
+        setItemHeight_ListWidget(d->list, heights[d->mode] * lineHeight_Text(d->itemFonts[0]));
+    }
 }
 
 iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
@@ -466,6 +468,22 @@ const char *icon_SidebarMode(enum iSidebarMode mode) {
     return tightModeLabels_[mode];
 }
 
+static void updateMetrics_SidebarWidget_(iSidebarWidget *d) {
+    if (d->resizer) {
+        d->resizer->rect.size.x = gap_UI;
+    }
+    d->maxButtonLabelWidth = 0;
+    for (int i = 0; i < max_SidebarMode; i++) {
+        if (d->modeButtons[i]) {
+            d->maxButtonLabelWidth = iMaxi(
+                d->maxButtonLabelWidth,
+                3 * gap_UI +
+                    measure_Text(font_LabelWidget(d->modeButtons[i]), normalModeLabels_[i]).x);
+        }
+    }
+    updateItemHeight_SidebarWidget_(d);
+}
+
 void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -493,6 +511,8 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iWidget *vdiv = makeVDiv_Widget();
     addChildFlags_Widget(w, vdiv, resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag);
     iZap(d->modeButtons);
+    d->resizer = NULL;
+    d->list = NULL;
     /* On a phone, the right sidebar is used exclusively for Identities. */
     const iBool isPhone = deviceType_App() == phone_AppDeviceType;
     if (!isPhone || d->side == left_SideBarSide) {
@@ -550,10 +570,10 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
         setFlags_Widget(d->resizer, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
     }
     setId_Widget(d->resizer, side == left_SideBarSide ? "sidebar.grab" : "sidebar2.grab");
-    d->resizer->rect.size.x = gap_UI;
     setBackgroundColor_Widget(d->resizer, none_ColorId);
     d->menu = NULL;
     addAction_Widget(w, SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh");
+    updateMetrics_SidebarWidget_(d);
 }
 
 void deinit_SidebarWidget(iSidebarWidget *d) {
@@ -561,15 +581,12 @@ void deinit_SidebarWidget(iSidebarWidget *d) {
 }
 
 void setButtonFont_SidebarWidget(iSidebarWidget *d, int font) {
-    d->maxButtonLabelWidth = 0;
     for (int i = 0; i < max_SidebarMode; i++) {
         if (d->modeButtons[i]) {
             setFont_LabelWidget(d->modeButtons[i], font);
-            d->maxButtonLabelWidth =
-                iMaxi(d->maxButtonLabelWidth,
-                      3 * gap_UI + measure_Text(font, normalModeLabels_[i]).x);
         }
     }
+    updateMetrics_SidebarWidget_(d);
 }
 
 static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
@@ -759,6 +776,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
     if (isResize_UserEvent(ev)) {
         checkModeButtonLayout_SidebarWidget_(d);
     }
+    else if (isMetricsChange_UserEvent(ev)) {
+        updateMetrics_SidebarWidget_(d);
+        arrange_Widget(w);
+        checkModeButtonLayout_SidebarWidget_(d);
+    }
     else if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
         const char *cmd = command_UserEvent(ev);
         if (equal_Command(cmd, "tabs.changed") || equal_Command(cmd, "document.changed")) {
diff --git a/src/ui/util.h b/src/ui/util.h
index 96e08e95..9e45f369 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -39,6 +39,9 @@ const char *    command_UserEvent   (const SDL_Event *);
 iLocalDef iBool isResize_UserEvent(const SDL_Event *d) {
     return isCommand_UserEvent(d, "window.resized");
 }
+iLocalDef iBool isMetricsChange_UserEvent(const SDL_Event *d) {
+    return isCommand_UserEvent(d, "metrics.changed");
+}
 
 #if defined (iPlatformApple)
 #   define KMOD_PRIMARY     KMOD_GUI
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 386ba6d6..f9c84c7a 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -397,17 +397,20 @@ void arrange_Widget(iWidget *d) {
         else {
             /* Evenly size all children. */
             iInt2 childSize = innerRect_Widget_(d).size;
+            iInt2 unpaddedChildSize = d->rect.size;
             if (d->flags & arrangeHorizontal_WidgetFlag) {
                 childSize.x /= childCount;
+                unpaddedChildSize.x /= childCount;
             }
             else if (d->flags & arrangeVertical_WidgetFlag) {
                 childSize.y /= childCount;
+                unpaddedChildSize.y /= childCount;
             }
             iForEach(ObjectList, i, d->children) {
                 iWidget *child = as_Widget(i.object);
                 if (!isCollapsed_Widget_(child) && ~child->flags & parentCannotResize_WidgetFlag) {
-                    if (dirs.x) setWidth_Widget_(child, childSize.x);
-                    if (dirs.y) setHeight_Widget_(child, childSize.y);
+                    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);
                 }
             }
         }
@@ -441,7 +444,7 @@ void arrange_Widget(iWidget *d) {
                 pos.y += child->rect.size.y;
             }
         }
-        else if (d->flags & resizeChildren_WidgetFlag) {
+        else if ((d->flags & resizeChildren_WidgetFlag) == resizeChildren_WidgetFlag) {
             child->rect.pos = pos;
         }
     }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index c5a1a360..955abf5d 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -100,6 +100,7 @@ enum iWidgetFlag {
 #define visualOffset_WidgetFlag             iBit64(45)
 #define parentCannotResize_WidgetFlag       iBit64(46)
 #define noTopFrame_WidgetFlag               iBit64(47)
+#define unpadded_WidgetFlag                 iBit64(48) /* ignore parent's padding */
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
diff --git a/src/ui/window.c b/src/ui/window.c
index fb5daa80..4f9ac9c3 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -511,7 +511,7 @@ static int navBarAvailableSpace_(iWidget *navBar) {
 }
 
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
-    if (equal_Command(cmd, "window.resized")) {
+    if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "metrics.changed")) {
         const iBool isPhone = deviceType_App() == phone_AppDeviceType;
         const iBool isNarrow = !isPhone && width_Rect(bounds_Widget(navBar)) / gap_UI < 140;
         /* Adjust navbar padding. */ {
@@ -810,8 +810,43 @@ static int appIconSize_(void) {
     return lineHeight_Text(uiContent_FontId);
 }
 
+static void updateMetrics_Window_(iWindow *d) {
+    /* Custom frame. */
+    iWidget *winBar = findChild_Widget(d->root, "winbar");
+    if (winBar) {
+        iWidget *appIcon  = findChild_Widget(winBar, "winbar.icon");
+        iWidget *appTitle = findChild_Widget(winBar, "winbar.title");
+        iWidget *appMin   = findChild_Widget(winBar, "winbar.min");
+        iWidget *appMax   = findChild_Widget(winBar, "winbar.max");
+        iWidget *appClose = findChild_Widget(winBar, "winbar.close");
+        setPadding_Widget(winBar, 0, gap_UI / 3, 0, 0);
+        setSize_Widget(appMin, init_I2(gap_UI * 11.5f, height_Widget(appTitle)));
+        setSize_Widget(appMax, appMin->rect.size);
+        setSize_Widget(appClose, appMin->rect.size);
+        setSize_Widget(appIcon, init_I2(appIconSize_(), appMin->rect.size.y));
+    }
+    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");
+    setPadding_Widget(as_Widget(url), 0, gap_UI, gap_UI, 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, -1);
+    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();
+}
+
 static void setupUserInterface_Window(iWindow *d) {
+#if defined (iPlatformMobile)
     const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
+#endif
     /* Children of root cover the entire window. */
     setFlags_Widget(d->root, resizeChildren_WidgetFlag, iTrue);
     setCommandHandler_Widget(d->root, handleRootCommands_);
@@ -825,7 +860,6 @@ static void setupUserInterface_Window(iWindow *d) {
     if (prefs_App()->customFrame) {
         setPadding1_Widget(div, 1);
         iWidget *winBar = new_Widget();
-        setPadding_Widget(winBar, 0, gap_UI / 3, 0, 0);
         setId_Widget(winBar, "winbar");
         setFlags_Widget(winBar,
                         arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
@@ -854,8 +888,6 @@ static void setupUserInterface_Window(iWindow *d) {
                          iClob(appMin = newLargeIcon_LabelWidget("\u2013", "window.minimize")),
                          frameless_WidgetFlag),
                      "winbar.min");
-        setSize_Widget(as_Widget(appMin),
-                       init_I2(gap_UI * 11.5f, height_Widget(appTitle)));
         addChildFlags_Widget(
             winBar,
             iClob(appMax = newLargeIcon_LabelWidget("\u25a1", "window.maximize toggle:1")),
@@ -864,10 +896,8 @@ static void setupUserInterface_Window(iWindow *d) {
         addChildFlags_Widget(winBar,
                              iClob(appClose = newLargeIcon_LabelWidget("\u2a2f", "window.close")),
                              frameless_WidgetFlag);
+        setId_Widget(appClose, "winbar.close");
         setFont_LabelWidget(appClose, uiContent_FontId);
-        setSize_Widget(as_Widget(appMax), as_Widget(appMin)->rect.size);
-        setSize_Widget(as_Widget(appClose), as_Widget(appMin)->rect.size);
-        setSize_Widget(appIcon, init_I2(appIconSize_(), as_Widget(appMin)->rect.size.y));
         addChild_Widget(div, iClob(winBar));
         setBackgroundColor_Widget(winBar, uiBackground_ColorId);
     }
@@ -895,23 +925,23 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(addChildFlags_Widget(navBar, iClob(idMenu), collapse_WidgetFlag), "navbar.ident");
         /* URL input field. */ {
             iInputWidget *url = new_InputWidget(0);
+            setFlags_Widget(as_Widget(url), resizeHeightOfChildren_WidgetFlag, iTrue);
             setSelectAllOnFocus_InputWidget(url, iTrue);
             setId_Widget(as_Widget(url), "url");
             setUrlContent_InputWidget(url, iTrue);
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
             addChildFlags_Widget(navBar, iClob(url), 0);
-            setPadding_Widget(as_Widget(url), 0, 0, gap_UI, 0);
             /* Page information/certificate warning. */ {
                 iLabelWidget *lock =
                     addChildFlags_Widget(as_Widget(url),
                                          iClob(newIcon_LabelWidget("\U0001f513", SDLK_i, KMOD_PRIMARY, "document.info")),
-                                         noBackground_WidgetFlag | frameless_WidgetFlag | moveToParentLeftEdge_WidgetFlag |
+                                         noBackground_WidgetFlag | frameless_WidgetFlag |  moveToParentLeftEdge_WidgetFlag |
+                                         unpadded_WidgetFlag |
                                              (deviceType_App() == desktop_AppDeviceType ? tight_WidgetFlag : 0));
                 setId_Widget(as_Widget(lock), "navbar.lock");
                 setFont_LabelWidget(lock, defaultSymbols_FontId);
                 updateTextCStr_LabelWidget(lock, "\U0001f512");
-                setContentPadding_InputWidget(url, width_Widget(lock) * 0.75, -1);
             }
             /* Feeds refresh indicator is inside the input field. */ {
                 iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
@@ -919,7 +949,7 @@ static void setupUserInterface_Window(iWindow *d) {
                 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));
+//                shrink_Rect(&as_Widget(fprog)->rect, init_I2(0, gap_UI));
                 addChildFlags_Widget(as_Widget(url),
                                      iClob(fprog),
                                      moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
@@ -930,7 +960,7 @@ static void setupUserInterface_Window(iWindow *d) {
                 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));
+//                shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
                 addChildFlags_Widget(as_Widget(url),
                                      iClob(progress),
                                      moveToParentRightEdge_WidgetFlag);
@@ -942,7 +972,7 @@ static void setupUserInterface_Window(iWindow *d) {
                 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));
+//                shrink_Rect(&as_Widget(queryInd)->rect, init_I2(0, gap_UI));
                 addChildFlags_Widget(as_Widget(url),
                                      iClob(queryInd),
                                      moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
@@ -1098,6 +1128,7 @@ static void setupUserInterface_Window(iWindow *d) {
         addAction_Widget(d->root, '4', rightSidebar_KeyModifier, "sidebar2.mode arg:3 toggle:1");
         addAction_Widget(d->root, '5', rightSidebar_KeyModifier, "sidebar2.mode arg:4 toggle:1");
     }
+    updateMetrics_Window_(d);
 }
 
 static void updateRootSize_Window_(iWindow *d, iBool notifyAlways) {
@@ -1636,6 +1667,9 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                     wasUsed = dispatchEvent_Widget(widget, &paste);
                 }
             }
+            if (isMetricsChange_UserEvent(&event)) {
+                updateMetrics_Window_(d);
+            }
             if (oldHover != hover_Widget()) {
                 postRefresh_App();
             }
@@ -1716,14 +1750,13 @@ void setTitle_Window(iWindow *d, const iString *title) {
 void setUiScale_Window(iWindow *d, float uiScale) {
     uiScale = iClamp(uiScale, 0.5f, 4.0f);
     if (d) {
-        d->uiScale = uiScale;
-#if 0
-        deinit_Text();
-        setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
-        init_Text(d->render);
-        postCommand_App("metrics.changed");
-        /* TODO: Dynamic UI metrics change. Widgets need to update themselves. */
-#endif
+        if (iAbs(d->uiScale - uiScale) > 0.0001f) {
+            d->uiScale = uiScale;
+            /* Dynamic UI metrics change. Widgets need to update themselves. */
+            setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
+            resetFonts_Text();
+            postCommand_App("metrics.changed");
+        }
     }
     else {
         initialUiScale_ = uiScale;