1 files changed, 77 insertions, 55 deletions

diff --git a/src/ui/root.c b/src/ui/root.c
index 76ef05c4..6cf3f424 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -269,6 +269,7 @@ iAnyObject *findWidget_Root(const char *id) {
 }
 
 void destroyPending_Root(iRoot *d) {
+    iRoot *oldRoot = current_Root();
     setCurrent_Root(d);
     iForEach(PtrSet, i, d->pendingDestruction) {
         iWidget *widget = *i.value;
@@ -282,7 +283,7 @@ void destroyPending_Root(iRoot *d) {
         iRelease(widget);
         remove_PtrSetIterator(&i);
     }
-    setCurrent_Root(NULL);
+    setCurrent_Root(oldRoot);
 }
 
 void postArrange_Root(iRoot *d) {
@@ -349,6 +350,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     }
     else if (equal_Command(cmd, "input.resized")) {
         /* No parent handled this, so do a full rearrangement. */
+        /* TODO: Defer this and do a single rearrangement later. */
         arrange_Widget(root);
         postRefresh_App();
         return iTrue;
@@ -414,6 +416,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         else {
             addChildPos_Widget(findChild_Widget(root, "stack"), iClob(sidebar), back_WidgetAddPos);
             setWidth_SidebarWidget(sidebar, (float) width_Widget(root) / (float) gap_UI);
+            setWidth_SidebarWidget(sidebar2, (float) width_Widget(root) / (float) gap_UI);
         }
         return iFalse;
     }
@@ -466,11 +469,11 @@ static void setReloadLabel_Root_(iRoot *d, iBool animating) {
     const iBool isMobile = deviceType_App() != desktop_AppDeviceType;
     iLabelWidget *label = findChild_Widget(d->widget, "reload");
     updateTextCStr_LabelWidget(
-        label, animating ? loadAnimationCStr_() : (isMobile ? pageMenuCStr_ : reloadCStr_));
-    if (isMobile) {
-        setCommand_LabelWidget(label,
-                               collectNewCStr_String(animating ? "navigate.reload" : "menu.open"));
-    }
+        label, animating ? loadAnimationCStr_() : (/*isMobile ? pageMenuCStr_ :*/ reloadCStr_));
+//    if (isMobile) {
+//        setCommand_LabelWidget(label,
+//                               collectNewCStr_String(animating ? "navigate.reload" : "menu.open"));
+//    }
 }
 
 static void checkLoadAnimation_Root_(iRoot *d) {
@@ -536,9 +539,12 @@ static iBool willPerformSearchQuery_(const iString *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));
+    const int lockWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
+    const int indicatorsWidth = width_Widget(findChild_Widget(navBar, "url.rightembed"));
+    /* The indicators widget has a padding that covers the urlButtons area. */
+    setContentPadding_InputWidget(url,
+                                  lockWidth - 2 * gap_UI, // * 0.75f,
+                                  indicatorsWidth);
 }
 
 static void showSearchQueryIndicator_(iBool show) {
@@ -585,17 +591,17 @@ static void updateNavBarSize_(iWidget *navBar) {
                 updateSize_LabelWidget(label);
             }
         }
+        updateUrlInputContentPadding_(navBar);
         /* Note that InputWidget uses the `tight` flag to adjust its inner padding. */
-        /* TODO: Is this redundant? See `updateMetrics_Window_()`. */
-        const int embedButtonWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
-        setContentPadding_InputWidget(findChild_Widget(navBar, "url"),
-                                      embedButtonWidth * 0.75f,
-                                      embedButtonWidth * 0.75f);
+//        const int embedButtonWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
+//        setContentPadding_InputWidget(findChild_Widget(navBar, "url"),
+//                                      embedButtonWidth * 0.75f,
+//                                      embedButtonWidth * 0.75f);
     }
     if (isPhone) {
         static const char *buttons[] = { "navbar.back",  "navbar.forward", "navbar.sidebar",
                                          "navbar.ident", "navbar.home",    "navbar.menu" };
-        iWidget *toolBar = findWidget_App("toolbar");
+        iWidget *toolBar = findWidget_Root("toolbar");
         setVisualOffset_Widget(toolBar, 0, 0, 0);
         setFlags_Widget(toolBar, hidden_WidgetFlag, isLandscape_App());
         iForIndices(i, buttons) {
@@ -901,15 +907,19 @@ void updateMetrics_Root(iRoot *d) {
     iWidget *url        = findChild_Widget(d->widget, "url");
     iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed");
     iWidget *embedPad   = findChild_Widget(navBar, "url.embedpad");
+    iWidget *urlButtons = findChild_Widget(navBar, "url.buttons");
     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);
-    setFixedSize_Widget(embedPad, init_I2(width_Widget(lock) + gap_UI / 2, 1));
-    setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
-                                  width_Widget(lock) * 0.75);
+//    updateSize_LabelWidget((iLabelWidget *) lock);
+//    updateSize_LabelWidget((iLabelWidget *) findChild_Widget(navBar, "reload"));
+//    arrange_Widget(urlButtons);
+    setFixedSize_Widget(embedPad, init_I2(width_Widget(urlButtons) + gap_UI / 2, 1));
+//    setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
+//                                  width_Widget(lock) * 0.75);
     rightEmbed->rect.pos.y = gap_UI;
     updatePadding_Root(d);
     arrange_Widget(d->widget);
+    updateUrlInputContentPadding_(navBar);
     postRefresh_App();
 }
 
@@ -1057,7 +1067,7 @@ void createUserInterface_Root(iRoot *d) {
                 setNoAutoMinHeight_LabelWidget(fprog, iTrue);
                 addChildFlags_Widget(rightEmbed,
                                      iClob(fprog),
-                                     collapse_WidgetFlag | frameless_WidgetFlag | hidden_WidgetFlag);
+                                     collapse_WidgetFlag | hidden_WidgetFlag | frameless_WidgetFlag);
             }
             /* Download progress indicator is also inside the input field, but hidden normally. */ {
                 iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 ${mb}", NULL);
@@ -1066,7 +1076,7 @@ void createUserInterface_Root(iRoot *d) {
                 setAlignVisually_LabelWidget(progress, iTrue);
                 setNoAutoMinHeight_LabelWidget(progress, iTrue);
                 addChildFlags_Widget(
-                    rightEmbed, iClob(progress), collapse_WidgetFlag);
+                    rightEmbed, iClob(progress), collapse_WidgetFlag | hidden_WidgetFlag);
             }
             /* Pinning indicator. */ {
                 iLabelWidget *pin = new_LabelWidget(uiTextAction_ColorEscape leftHalf_Icon, NULL);
@@ -1076,39 +1086,44 @@ void createUserInterface_Root(iRoot *d) {
                 setNoAutoMinHeight_LabelWidget(pin, iTrue);
                 addChildFlags_Widget(rightEmbed,
                                      iClob(pin),
-                                     collapse_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag);
+                                     collapse_WidgetFlag | hidden_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag);
+            }
+            iWidget *urlButtons = new_Widget();
+            setId_Widget(urlButtons, "url.buttons");
+            setFlags_Widget(urlButtons, embedFlags | arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+            /* Mobile page menu. */
+            if (deviceType_App() != desktop_AppDeviceType) {
+                iLabelWidget *pageMenuButton;
+                /* In a mobile layout, the reload button is replaced with the Page/Ellipsis menu. */
+                pageMenuButton = makeMenuButton_LabelWidget(pageMenuCStr_,
+                    (iMenuItem[]){
+                        { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
+                        { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
+                        { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
+                        { "---", 0, 0, NULL },
+                        { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                        { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
+                        { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
+                        { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+                        { "---", 0, 0, NULL },
+                        { "${menu.page.copyurl}", 0, 0, "document.copylink" },
+                        { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
+                        { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
+                    12);
+                setId_Widget(as_Widget(pageMenuButton), "pagemenubutton");
+                setFont_LabelWidget(pageMenuButton, uiContentBold_FontId);
+                setAlignVisually_LabelWidget(pageMenuButton, iTrue);
+                addChildFlags_Widget(urlButtons, iClob(pageMenuButton), embedFlags);
+                updateSize_LabelWidget(pageMenuButton);
             }
             /* Reload button. */ {
-                iLabelWidget *reload;
-                if (deviceType_App() == desktop_AppDeviceType) {
-                    reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
-                }
-                else {
-                    /* In a mobile layout, the reload button is replaced with the Page/Ellipsis menu. */
-                    reload = makeMenuButton_LabelWidget(pageMenuCStr_,
-                                                        (iMenuItem[]){
-                                                            { reload_Icon " ${menu.reload}", reload_KeyShortcut, "navigate.reload" },
-                                                            { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
-                                                            { "---", 0, 0, NULL },
-                                                            { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
-                                                            { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
-                                                            { "---", 0, 0, NULL },
-                                                            { pin_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
-                                                            { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
-                                                            { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
-                                                            { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
-                                                            { "---", 0, 0, NULL },
-                                                            { "${menu.page.copyurl}", 0, 0, "document.copylink" },
-                                                            { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
-                                                            { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
-                                                        14);
-                    setFont_LabelWidget((iLabelWidget *) reload, uiContentBold_FontId);
-                    setAlignVisually_LabelWidget((iLabelWidget *) reload, iTrue);
-                }
+                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(urlButtons, iClob(reload), embedFlags);
                 updateSize_LabelWidget(reload);
             }
+            addChildFlags_Widget(as_Widget(url), iClob(urlButtons), moveToParentRightEdge_WidgetFlag);
+            arrange_Widget(urlButtons);
             setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
         }
         if (deviceType_App() != desktop_AppDeviceType) {
@@ -1216,7 +1231,9 @@ void createUserInterface_Root(iRoot *d) {
         setFlags_Widget(toolBar, moveToParentBottomEdge_WidgetFlag |
                                      parentCannotResizeHeight_WidgetFlag |
                                      resizeWidthOfChildren_WidgetFlag |
-                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
+                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag |
+                                     commandOnClick_WidgetFlag |
+                                     drawBackgroundToBottom_WidgetFlag, iTrue);
         setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")),
@@ -1231,7 +1248,7 @@ void createUserInterface_Root(iRoot *d) {
                                           frameless_WidgetFlag),
                      "toolbar.ident");
         setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget("\U0001f588", "toolbar.showview arg:-1")),
+                                          iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
                                           frameless_WidgetFlag | commandOnClick_WidgetFlag),
                      "toolbar.view");
         iLabelWidget *menuButton = makeMenuButton_LabelWidget("\U0001d362", phoneNavMenuItems_,
@@ -1244,17 +1261,17 @@ void createUserInterface_Root(iRoot *d) {
             setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
             setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
             //            setBackgroundColor_Widget(i.object, tmBannerSideTitle_ColorId);
-            }
+        }
         const iMenuItem items[] = {
-            { pin_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
+            { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
             { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" },
             { clock_Icon " ${sidebar.history}", 0, 0, "toolbar.showview arg:2" },
             { page_Icon " ${toolbar.outline}", 0, 0, "toolbar.showview arg:4" },
-            };
+        };
         iWidget *menu = makeMenu_Widget(findChild_Widget(toolBar, "toolbar.view"),
                                         items, iElemCount(items));
         setId_Widget(menu, "toolbar.menu"); /* view menu */
-        }
+    }
 #endif
     updatePadding_Root(d);
     /* Global context menus. */ {
@@ -1319,6 +1336,11 @@ void createUserInterface_Root(iRoot *d) {
     }
     updateMetrics_Root(d);
     updateNavBarSize_(navBar);
+    if (deviceType_App() == phone_AppDeviceType) {
+        const float sidebarWidth = width_Widget(root) / (float) gap_UI;
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar"), sidebarWidth);
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar2"), sidebarWidth);
+    }
 }
 
 void showToolbars_Root(iRoot *d, iBool show) {