6 files changed, 85 insertions, 36 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index cb075c49..683793ea 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2894,12 +2894,10 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     }
     if (run->flags & siteBanner_GmRunFlag) {
         /* Banner background. */
-        fillRect_Paint(
-            &d->paint,
-            initCorners_Rect(topLeft_Rect(d->widgetBounds),
-                             init_I2(right_Rect(bounds_Widget(constAs_Widget(d->widget))),
-                                     visPos.y + height_Rect(run->visBounds))),
-            tmBannerBackground_ColorId);
+        iRect bannerBack = initCorners_Rect(topLeft_Rect(d->widgetBounds),
+                                            init_I2(right_Rect(bounds_Widget(constAs_Widget(d->widget))),
+                                                    visPos.y + height_Rect(run->visBounds)));
+        fillRect_Paint(&d->paint, bannerBack, tmBannerBackground_ColorId);
         drawBannerRun_DrawContext_(d, run, visPos);
     }
     else {
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index a0664433..1b16a028 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -139,16 +139,17 @@ static void keyStr_LabelWidget_(const iLabelWidget *d, iString *str) {
 
 static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int *frame1, int *frame2) {
     const iWidget *w           = constAs_Widget(d);
-    const iBool    isPress     = (flags_Widget(w) & pressed_WidgetFlag) != 0;
-    const iBool    isSel       = (flags_Widget(w) & selected_WidgetFlag) != 0;
-    const iBool    isFrameless = (flags_Widget(w) & frameless_WidgetFlag) != 0;
+    const int64_t  flags       = flags_Widget(w);
+    const iBool    isPress     = (flags & pressed_WidgetFlag) != 0;
+    const iBool    isSel       = (flags & selected_WidgetFlag) != 0;
+    const iBool    isFrameless = (flags & frameless_WidgetFlag) != 0;
     const iBool    isButton    = d->click.button != 0;
     /* Default color state. */
-    *bg     = isButton ? uiBackground_ColorId : none_ColorId;
+    *bg     = isButton && ~flags & noBackground_WidgetFlag ? uiBackground_ColorId : none_ColorId;
     *fg     = uiText_ColorId;
     *frame1 = isButton ? uiEmboss1_ColorId : d->widget.frameColor;
     *frame2 = isButton ? uiEmboss2_ColorId : *frame1;
-    if (flags_Widget(w) & disabled_WidgetFlag && isButton) {
+    if (flags & disabled_WidgetFlag && isButton) {
         *fg = uiTextDisabled_ColorId;
     }
     if (isSel) {
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5c6285fb..456bcee7 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -428,11 +428,11 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
 }
 
 enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
-    return d->mode;
+    return d ? d->mode : 0;
 }
 
 int width_SidebarWidget(const iSidebarWidget *d) {
-    return d->width;
+    return d ? d->width : 0;
 }
 
 static const char *normalModeLabels_[max_SidebarMode] = {
@@ -488,12 +488,16 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     addChildFlags_Widget(vdiv,
                          iClob(buttons),
                          arrangeHorizontal_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
-                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag);
+                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag |
+                         drawBackgroundToHorizontalSafeArea_WidgetFlag);
+    if (deviceType_App() == phone_AppDeviceType) {
+        setBackgroundColor_Widget(buttons, uiBackground_ColorId);
+    }
     iWidget *content = new_Widget();
     setFlags_Widget(content, resizeChildren_WidgetFlag, iTrue);
     d->list = new_ListWidget();
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
-    addChild_Widget(content, iClob(d->list));
+    addChildFlags_Widget(content, iClob(d->list), drawBackgroundToHorizontalSafeArea_WidgetFlag);
     d->contextItem = NULL;
     d->blank = new_Widget();
     addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 128aa39c..0e020080 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -629,7 +629,9 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
 }
 
 void drawBackground_Widget(const iWidget *d) {
-    if (d->flags & hidden_WidgetFlag) return;
+    if (d->flags & (hidden_WidgetFlag | noBackground_WidgetFlag)) {
+        return;
+    }
     if (flags_Widget(d) & borderTop_WidgetFlag) {
         const iRect rect = bounds_Widget(d);
         iPaint p;
@@ -637,10 +639,36 @@ void drawBackground_Widget(const iWidget *d) {
         drawHLine_Paint(&p, topLeft_Rect(rect), width_Rect(rect), uiBackgroundFramelessHover_ColorId);
     }
     if (d->bgColor >= 0 || d->frameColor >= 0) {
-        const iRect rect = bounds_Widget(d);
+        iRect rect = bounds_Widget(d);
         iPaint p;
         init_Paint(&p);
         if (d->bgColor >= 0) {
+#if defined (iPlatformAppleMobile)
+            if (d->flags & (drawBackgroundToHorizontalSafeArea_WidgetFlag |
+                            drawBackgroundToVerticalSafeArea_WidgetFlag)) {
+                const iInt2 rootSize = rootSize_Window(get_Window());
+                const iInt2 center = divi_I2(rootSize, 2);
+                int top = 0, right = 0, bottom = 0, left = 0;
+                if (d->flags & drawBackgroundToHorizontalSafeArea_WidgetFlag) {
+                    const iBool isWide = width_Rect(rect) > rootSize.x * 9 / 10;
+                    if (isWide || mid_Rect(rect).x < center.x) {
+                        left = -left_Rect(rect);
+                    }
+                    if (isWide || mid_Rect(rect).x > center.x) {
+                        right = rootSize.x - right_Rect(rect);
+                    }
+                }
+                if (d->flags & drawBackgroundToVerticalSafeArea_WidgetFlag) {
+                    if (top_Rect(rect) > center.y) {
+                        bottom = rootSize.y - bottom_Rect(rect);
+                    }
+                    if (bottom_Rect(rect) < center.y) {
+                        top = -top_Rect(rect);
+                    }
+                }
+                adjustEdges_Rect(&rect, top, right, bottom, left);
+            }
+#endif
             fillRect_Paint(&p, rect, d->bgColor);
         }
         if (d->frameColor >= 0 && ~d->flags & frameless_WidgetFlag) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 0b7a76e1..66fe222b 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -93,6 +93,9 @@ enum iWidgetFlag {
 #define focusRoot_WidgetFlag                iBit64(39)
 #define unhittable_WidgetFlag               iBit64(40)
 #define touchDrag_WidgetFlag                iBit64(41) /* touch event behavior: immediate drag */
+#define noBackground_WidgetFlag             iBit64(42)
+#define drawBackgroundToHorizontalSafeArea_WidgetFlag   iBit64(43)
+#define drawBackgroundToVerticalSafeArea_WidgetFlag     iBit64(44)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
@@ -159,12 +162,18 @@ void    drawBackground_Widget(const iWidget *);
 void    drawChildren_Widget (const iWidget *);
 
 iLocalDef int width_Widget(const iAnyObject *d) {
-    iAssert(isInstance_Object(d, &Class_Widget));
-    return ((const iWidget *) d)->rect.size.x;
+    if (d) {
+        iAssert(isInstance_Object(d, &Class_Widget));
+        return ((const iWidget *) d)->rect.size.x;
+    }
+    return 0;
 }
 iLocalDef int height_Widget(const iAnyObject *d) {
-    iAssert(isInstance_Object(d, &Class_Widget));
-    return ((const iWidget *) d)->rect.size.y;
+    if (d) {
+        iAssert(isInstance_Object(d, &Class_Widget));
+        return ((const iWidget *) d)->rect.size.y;
+    }
+    return 0;
 }
 iLocalDef iObjectList *children_Widget(iAnyObject *d) {
     iAssert(isInstance_Object(d, &Class_Widget));
diff --git a/src/ui/window.c b/src/ui/window.c
index 2b04244c..559b41a6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -164,6 +164,7 @@ static const iMenuItem navMenuItems_[] = {
     { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
 };
 #else
+/* Phone menu. */
 static const iMenuItem navMenuItems_[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { "Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
@@ -171,19 +172,15 @@ static const iMenuItem navMenuItems_[] = {
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
     { "---", 0, 0, NULL },
-    { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
-    { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
+    { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
     { "---", 0, 0, NULL },
     { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
-    { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
-    { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" },
-    { "---", 0, 0, NULL },
-    { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
+    { "List Feed Entries", 0, 0, "!open url:about:feeds" },
     { "---", 0, 0, NULL },
-    { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { "Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "Help", SDLK_F1, 0, "!open url:about:help" },
     { "Release Notes", 0, 0, "!open url:about:version" },
 };
@@ -450,8 +447,6 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         else {
             arrange_Widget(navBar);
         }
-        printf("navbar hgt:%i\n", height_Widget(findWidget_App("navbar")));
-        printf("navbar.child[0] w:%i\n", width_Widget(child_Widget(findWidget_App("navbar"), 0)));
         refresh_Widget(navBar);
         postCommand_Widget(navBar, "layout.changed id:navbar");
         return iFalse;
@@ -689,8 +684,11 @@ static void setupUserInterface_Window(iWindow *d) {
         int topPad = !findChild_Widget(div, "winbar") ? gap_UI / 2 : 0;
         setPadding_Widget(navBar, gap_UI, topPad, gap_UI, gap_UI / 2);
         setFlags_Widget(navBar,
-                        arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
-                            arrangeHorizontal_WidgetFlag,
+                        arrangeHeight_WidgetFlag |
+                        resizeChildren_WidgetFlag |
+                        arrangeHorizontal_WidgetFlag |
+                        drawBackgroundToHorizontalSafeArea_WidgetFlag |
+                        drawBackgroundToVerticalSafeArea_WidgetFlag,
                         iTrue);
         addChild_Widget(div, iClob(navBar));
         setBackgroundColor_Widget(navBar, uiBackground_ColorId);
@@ -769,7 +767,11 @@ static void setupUserInterface_Window(iWindow *d) {
         setBackgroundColor_Widget(tabBar, uiBackground_ColorId);
         appendTabPage_Widget(tabBar, iClob(new_DocumentWidget()), "Document", 0, 0);
         iWidget *buttons = findChild_Widget(tabBar, "tabs.buttons");
-        setFlags_Widget(buttons, collapse_WidgetFlag | hidden_WidgetFlag, iTrue);
+        setFlags_Widget(buttons, collapse_WidgetFlag | hidden_WidgetFlag |
+                        drawBackgroundToHorizontalSafeArea_WidgetFlag, iTrue);
+        if (deviceType_App() == phone_AppDeviceType) {
+            setBackgroundColor_Widget(buttons, uiBackground_ColorId);
+        }
         setId_Widget(
             addChild_Widget(buttons, iClob(newIcon_LabelWidget("\u2795", 0, 0, "tabs.new"))),
             "newtab");
@@ -778,8 +780,10 @@ static void setupUserInterface_Window(iWindow *d) {
         iWidget *content = findChild_Widget(d->root, "tabs.content");
         iSidebarWidget *sidebar1 = new_SidebarWidget(left_SideBarSide);
         addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
-        iSidebarWidget *sidebar2 = new_SidebarWidget(right_SideBarSide);
-        addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
+        if (deviceType_App() != phone_AppDeviceType) {
+            iSidebarWidget *sidebar2 = new_SidebarWidget(right_SideBarSide);
+            addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
+        }
     }
     /* Lookup results. */ {
         iLookupWidget *lookup = new_LookupWidget();
@@ -815,13 +819,18 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(toolBar, "toolbar");
         setFlags_Widget(toolBar, collapse_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
                         arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
-        setBackgroundColor_Widget(toolBar, uiBackground_ColorId);
+        setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         addChildFlags_Widget(toolBar, iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")), frameless_WidgetFlag);
         addChildFlags_Widget(toolBar, iClob(newLargeIcon_LabelWidget("\U0001f872", "navigate.forward")), frameless_WidgetFlag);
         addChildFlags_Widget(toolBar, iClob(newLargeIcon_LabelWidget("\U0001f464", "sidebar.mode arg:3 show:1")), frameless_WidgetFlag);
         iLabelWidget *menuButton = makeMenuButton_LabelWidget("\U0001d362", navMenuItems_, iElemCount(navMenuItems_));
         setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
         addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag);
+        iForEach(ObjectList, i, children_Widget(toolBar)) {
+            iLabelWidget *btn = i.object;
+            setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
+            setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);            
+        }
     }
 #endif
     updatePadding_Window_(d);