7 files changed, 79 insertions, 22 deletions

diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 7a1d4de8..3e3c76fb 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -51,6 +51,13 @@ iChar           icon_LabelWidget        (const iLabelWidget *);
 iLabelWidget *newKeyMods_LabelWidget(const char *label, int key, int kmods, const char *command);
 iLabelWidget *newColor_LabelWidget  (const char *text, int color);
 
+iLocalDef iLabelWidget *newFont_LabelWidget(const char *label, const char *command, int fontId) {
+    iLabelWidget *d = new_LabelWidget(label, command);
+    checkIcon_LabelWidget(d);
+    setFont_LabelWidget(d, fontId);
+    return d;
+}
+
 iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
     return new_LabelWidget("", NULL);
 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index c2cfe998..8da09b2f 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -547,7 +547,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
         iLabelWidget *heading = new_LabelWidget("Identities", NULL);
         setBackgroundColor_Widget(as_Widget(heading), uiBackgroundUnfocusedSelection_ColorId);
         setTextColor_LabelWidget(heading, uiIcon_ColorId);
-        setFont_LabelWidget(addChild_Widget(vdiv, iClob(heading)),
+        setFont_LabelWidget(addChildFlags_Widget(vdiv, iClob(heading), frameless_WidgetFlag),
                             uiLabelLarge_FontId);
     }
     iWidget *content = new_Widget();
@@ -622,6 +622,7 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
             const iGmDocument *doc = document_DocumentWidget(document_App());
             const iGmHeading *head = constAt_Array(headings_GmDocument(doc), item->id);
             postCommandf_App("document.goto loc:%p", head->text.start);
+            dismissPortraitPhoneSidebars_Window(get_Window());
             break;
         }
         case feeds_SidebarMode: {
diff --git a/src/ui/util.c b/src/ui/util.c
index 47cd3ccd..0d34658e 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -528,7 +528,7 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
     if (isPortraitPhone) {
         setFlags_Widget(d, arrangeWidth_WidgetFlag | resizeChildrenToWidestChild_WidgetFlag, iFalse);
-        setFlags_Widget(d, resizeWidthOfChildren_WidgetFlag, iTrue);
+        setFlags_Widget(d, resizeWidthOfChildren_WidgetFlag | drawBackgroundToBottom_WidgetFlag, iTrue);
         if (!isSlidePanel) {
             setFlags_Widget(d, borderTop_WidgetFlag, iTrue);
         }
@@ -912,6 +912,25 @@ static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
         postCommand_App("panel.close");
         return iTrue;
     }
+    if (equal_Command(cmd, "window.resized")) {
+        iWidget *sheet = parent_Widget(d);
+#if defined (iPlatformAppleMobile)
+        float left, top, right, bottom;
+        safeAreaInsets_iOS(&left, &top, &right, &bottom);
+        /* TODO: incorrect */
+        if (isLandscape_App()) {
+            setPadding_Widget(sheet, left, 0, right, 0);
+        }
+        else {
+            setPadding1_Widget(sheet, 0);
+        }
+#endif
+    }
+    if (equal_Command(cmd, "panel.showhelp")) {
+        postCommand_App("prefs.dismiss");
+        postCommand_App("open url:about:help");
+        return iTrue;
+    }
     if (equal_Command(cmd, "panel.close")) {
         iBool wasClosed = iFalse;
         iForEach(ObjectList, i, children_Widget(parent_Widget(d))) {
@@ -975,9 +994,9 @@ static iAnyObject *addPanelChild_(iWidget *panel, iAnyObject *child, int64_t fla
     /* Erase redundant/unused headings. */
     if (precedingElementType == heading_PrefsElement &&
         (!child || elementType == heading_PrefsElement)) {
-        iRelease(removeChild_Widget(panel, back_ObjectList(children_Widget(panel))));
-        if (!cmp_String(id_Widget(constAs_Widget(back_ObjectList(children_Widget(panel)))), "padding")) {
-            iRelease(removeChild_Widget(panel, back_ObjectList(children_Widget(panel))));
+        iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
+        if (!cmp_String(id_Widget(constAs_Widget(lastChild_Widget(panel))), "padding")) {
+            iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
         }
     }
     if (child) {
@@ -1009,6 +1028,18 @@ static void stripTrailingColon_(iLabelWidget *label) {
     }
 }
 
+static iLabelWidget *makePanelButton_(const char *text, const char *command) {
+    iLabelWidget *btn = new_LabelWidget(text, command);
+    setFlags_Widget(as_Widget(btn),
+                    borderBottom_WidgetFlag | alignLeft_WidgetFlag |
+                    frameless_WidgetFlag | extraPadding_WidgetFlag,
+                    iTrue);
+    checkIcon_LabelWidget(btn);
+    setFont_LabelWidget(btn, defaultBig_FontId);
+    setBackgroundColor_Widget(as_Widget(btn), uiBackgroundSidebar_ColorId);
+    return btn;
+}
+
 void finalizeSheet_Widget(iWidget *sheet) {
     if (deviceType_App() == phone_AppDeviceType) {
         /* The sheet contents are completely rearranged on a phone. We'll set up a linear
@@ -1043,12 +1074,16 @@ void finalizeSheet_Widget(iWidget *sheet) {
                         frameless_WidgetFlag |
                         resizeWidthOfChildren_WidgetFlag,
                         iTrue);
-        setBackgroundColor_Widget(sheet, green_ColorId);
+        setBackgroundColor_Widget(sheet, uiBackground_ColorId);
         iPtrArray *contents = collect_PtrArray(new_PtrArray()); /* two-column pages */
         iPtrArray *panelButtons = collect_PtrArray(new_PtrArray());
         iWidget *tabs = findChild_Widget(sheet, "prefs.tabs");
+        const iBool isPrefs = (tabs != NULL);
+        const int64_t panelButtonFlags = borderBottom_WidgetFlag | alignLeft_WidgetFlag |
+                                         frameless_WidgetFlag | extraPadding_WidgetFlag;
         iWidget *topPanel = new_Widget();
         setId_Widget(topPanel, "panel.top");
+        addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
         if (tabs) {
             iRelease(removeChild_Widget(sheet, child_Widget(sheet, 0))); /* heading */
             iRelease(removeChild_Widget(sheet, findChild_Widget(sheet, "dialogbuttons")));
@@ -1063,22 +1098,21 @@ void finalizeSheet_Widget(iWidget *sheet) {
                 iLabelWidget *panelButton;
                 pushBack_PtrArray(panelButtons,
                                   addChildFlags_Widget(topPanel,
-                                                       iClob(panelButton = new_LabelWidget
-                                                             (i == 1 ? "User Interface" : cstr_String(text),
-                                                              "panel.open")),
-                                                       alignLeft_WidgetFlag | frameless_WidgetFlag |
-                                                       borderBottom_WidgetFlag | extraPadding_WidgetFlag |
+                                                       iClob(panelButton = makePanelButton_(
+                                                             i == 1 ? "User Interface" : cstr_String(text),
+                                                             "panel.open")),
+                                                       (i == 0 ? borderTop_WidgetFlag : 0) |
                                                        chevron_WidgetFlag));
                 const iChar icons[] = {
-                    0x2699, /* gear */
+                    0x02699, /* gear */
                     0x1f4f1, /* mobile phone */
                     0x1f3a8, /* palette */
                     0x1f523,
                     0x1f5a7, /* computer network */
                 };
                 setIcon_LabelWidget(panelButton, icons[i]);
-                setFont_LabelWidget(panelButton, defaultBig_FontId);
-                setBackgroundColor_Widget(as_Widget(panelButton), uiBackgroundSidebar_ColorId);
+//                setFont_LabelWidget(panelButton, defaultBig_FontId);
+//                setBackgroundColor_Widget(as_Widget(panelButton), uiBackgroundSidebar_ColorId);
                 iRelease(page);
                 delete_String(text);
             }
@@ -1259,9 +1293,19 @@ void finalizeSheet_Widget(iWidget *sheet) {
             }
             addPanelChild_(owner, NULL, 0, 0, prevElement);
             destroy_Widget(pageContent);
-            addChildFlags_Widget(owner, iClob(new_Widget()), expand_WidgetFlag);
+            setFlags_Widget(owner, drawBackgroundToBottom_WidgetFlag, iTrue);
         }
         destroyPending_Widget();
+        /* Additional elements for preferences. */
+        if (isPrefs) {
+            addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
+            addChildFlags_Widget(topPanel,
+                                 iClob(makePanelButton_(info_Icon " Help", "panel.showhelp")),
+                                 borderTop_WidgetFlag);
+            addChildFlags_Widget(topPanel,
+                                 iClob(makePanelButton_(planet_Icon " About", "panel.about")),
+                                 chevron_WidgetFlag);
+        }
         /* Navbar. */ {
             iWidget *navi = new_Widget();
             setSize_Widget(navi, init_I2(-1, navBarHeight));
@@ -1276,8 +1320,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
             setFont_LabelWidget(back, defaultBig_FontId);
             addChildFlags_Widget(sheet, iClob(navi),
                                  arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
-                                 resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag |
-                                 borderBottom_WidgetFlag);
+                                 resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag);
         }
         arrange_Widget(sheet->parent);
         printTree_Widget(sheet);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index b31b3c08..4dd545b5 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -776,6 +776,9 @@ void drawBackground_Widget(const iWidget *d) {
     }
     if (d->bgColor >= 0 || d->frameColor >= 0) {
         iRect rect = bounds_Widget(d);
+        if (d->flags & drawBackgroundToBottom_WidgetFlag) {
+            rect.size.y = rootSize_Window(get_Window()).y - top_Rect(rect);
+        }
         iPaint p;
         init_Paint(&p);
         if (d->bgColor >= 0) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 4b1f42d3..3edcb3f4 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -105,6 +105,7 @@ enum iWidgetFlag {
 #define borderBottom_WidgetFlag             iBit64(50)
 #define horizontalOffset_WidgetFlag         iBit64(51) /* default is vertical offset */
 #define chevron_WidgetFlag                  iBit64(52)
+#define drawBackgroundToBottom_WidgetFlag   iBit64(53)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
@@ -196,6 +197,9 @@ iLocalDef iWidget *parent_Widget(const iAnyObject *d) {
     }
     return NULL;
 }
+iLocalDef iWidget *lastChild_Widget(iAnyObject *d) {
+    return (iWidget *) back_ObjectList(children_Widget(d));
+}
 
 iBool   isVisible_Widget            (const iAnyObject *);
 iBool   isDisabled_Widget           (const iAnyObject *);
diff --git a/src/ui/window.c b/src/ui/window.c
index af9b20ba..637174b4 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -225,8 +225,6 @@ static const iMenuItem phoneNavMenuItems_[] = {
     { "List Feed Entries", 0, 0, "!open url:about:feeds" },
     { "---", 0, 0, NULL },
     { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
-    { "Help", SDLK_F1, 0, "!open url:about:help" },
-    { "Release Notes", 0, 0, "!open url:about:version" },
 };
 #endif /* AppleMobile */
 #endif
@@ -466,7 +464,7 @@ static void updatePadding_Window_(iWindow *d) {
 #endif
 }
 
-static void dismissPortraitPhoneSidebars_(void) {
+void dismissPortraitPhoneSidebars_Window(iWindow *d) {
     if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) {
         iWidget *sidebar = findWidget_App("sidebar");
         iWidget *sidebar2 = findWidget_App("sidebar2");
@@ -621,7 +619,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 postCommand_App("visited.changed"); /* sidebar will update */
                 setText_InputWidget(url, urlStr);
                 checkLoadAnimation_Window_(get_Window());
-                dismissPortraitPhoneSidebars_();
+                dismissPortraitPhoneSidebars_Window(get_Window());
                 updateNavBarIdentity_(navBar);
                 /* Icon updates should be limited to automatically chosen icons if the user
                    is allowed to pick their own in the future. */
@@ -639,7 +637,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 iInputWidget *url = findChild_Widget(navBar, "url");
                 setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
                 checkLoadAnimation_Window_(get_Window());
-                dismissPortraitPhoneSidebars_();
+                dismissPortraitPhoneSidebars_Window(get_Window());
                 return iFalse;
             }
         }
diff --git a/src/ui/window.h b/src/ui/window.h
index dc865277..2ab5d990 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -89,6 +89,7 @@ void        setFreezeDraw_Window    (iWindow *, iBool freezeDraw);
 void        setCursor_Window        (iWindow *, int cursor);
 void        setSnap_Window          (iWindow *, int snapMode);
 void        setKeyboardHeight_Window(iWindow *, int height);
+void        dismissPortraitPhoneSidebars_Window (iWindow *);
 
 uint32_t    id_Window               (const iWindow *);
 iInt2       rootSize_Window         (const iWindow *);