6 files changed, 23 insertions, 17 deletions

diff --git a/src/app.c b/src/app.c
index 3107cda3..11c79bcb 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2103,6 +2103,7 @@ iBool handleCommand_App(const char *cmd) {
         iCertImportWidget *imp = new_CertImportWidget();
         setPageContent_CertImportWidget(imp, sourceContent_DocumentWidget(document_App()));
         addChild_Widget(d->window->root, iClob(imp));
+        finalizeSheet_Widget(as_Widget(imp));
         postRefresh_App();
         return iTrue;
     }
diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index dd800dd2..3a037135 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -167,7 +167,7 @@ void init_CertImportWidget(iCertImportWidget *d) {
                          "certimport.accept" } },
         2);
     addChild_Widget(w, iClob(buttons));
-    arrange_Widget(w);
+//    arrange_Widget(w);
     if (deviceType_App() != desktop_AppDeviceType) {
         /* Try auto-pasting. */
         postCommand_App("certimport.paste");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 4d1cb3b0..cb084ccc 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -627,23 +627,17 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     addChild_Widget(content, iClob(listAndActions));
     d->list = new_ListWidget();
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
-    if (!isPhone) {
-        addChildFlags_Widget(listAndActions,
-                             iClob(d->list),
-                             expand_WidgetFlag | drawBackgroundToHorizontalSafeArea_WidgetFlag);
-    }
-    setId_Widget(addChildFlags_Widget(listAndActions,
-                                      iClob(d->actions = new_Widget()),
-                                      arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
-                                          resizeWidthOfChildren_WidgetFlag |
-                                          drawBackgroundToHorizontalSafeArea_WidgetFlag),
+    addChildFlags_Widget(listAndActions,
+                         iClob(d->list),
+                         expand_WidgetFlag | drawBackgroundToHorizontalSafeArea_WidgetFlag);
+    setId_Widget(addChildPosFlags_Widget(listAndActions,
+                                         iClob(d->actions = new_Widget()),
+                                         isPhone ? front_WidgetAddPos : back_WidgetAddPos,
+                                         arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
+                                             resizeWidthOfChildren_WidgetFlag |
+                                             drawBackgroundToHorizontalSafeArea_WidgetFlag),
                  "actions");
     setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
-    if (isPhone) {
-        addChildFlags_Widget(listAndActions,
-                             iClob(d->list),
-                             expand_WidgetFlag | drawBackgroundToHorizontalSafeArea_WidgetFlag);
-    }
     d->contextItem = NULL;
     d->blank = new_Widget();
     addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
@@ -669,7 +663,6 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     if (side == left_SideBarSide) {
         postCommand_App("~sidebar.update"); /* unread count */
     }
-    printTree_Widget(as_Widget(d));
 }
 
 void deinit_SidebarWidget(iSidebarWidget *d) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 6fa3e293..f430ac1c 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1138,6 +1138,9 @@ static iAnyObject *addPanelChild_(iWidget *panel, iAnyObject *child, int64_t fla
                  precedingElementType != heading_PrefsElement) ||
                 (elementType == dropdown_PrefsElement &&
                  precedingElementType != dropdown_PrefsElement &&
+                 precedingElementType != heading_PrefsElement) ||
+                (elementType == textInput_PrefsElement &&
+                 precedingElementType != textInput_PrefsElement &&
                  precedingElementType != heading_PrefsElement)) {
                 addChild_Widget(panel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
             }
@@ -1552,6 +1555,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                                  resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag);
         }
         updateSheetPanelMetrics_(sheet);
+        iAssert(sheet->parent);
         arrange_Widget(sheet->parent);
         postCommand_App("widget.overflow"); /* with the correct dimensions */
 //        printTree_Widget(sheet);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 78a8a8bf..da7efb57 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1130,6 +1130,10 @@ iAny *addChild_Widget(iWidget *d, iAnyObject *child) {
 }
 
 iAny *addChildPos_Widget(iWidget *d, iAnyObject *child, enum iWidgetAddPos addPos) {
+    return addChildPosFlags_Widget(d, child, addPos, 0);
+}
+
+iAny *addChildPosFlags_Widget(iWidget *d, iAnyObject *child, enum iWidgetAddPos addPos, int64_t flags) {
     iAssert(child);
     iAssert(d != child);
     iWidget *widget = as_Widget(child);
@@ -1144,6 +1148,9 @@ iAny *addChildPos_Widget(iWidget *d, iAnyObject *child, enum iWidgetAddPos addPo
         pushFront_ObjectList(d->children, widget); /* ref */
     }
     widget->parent = d;
+    if (flags) {
+        setFlags_Widget(child, flags, iTrue);
+    }
     return child;
 }
 
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 2116e0d8..64e502e6 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -235,6 +235,7 @@ void    setFrameColor_Widget        (iWidget *, int frameColor);
 void    setCommandHandler_Widget    (iWidget *, iBool (*handler)(iWidget *, const char *));
 iAny *  addChild_Widget             (iWidget *, iAnyObject *child); /* holds a ref */
 iAny *  addChildPos_Widget          (iWidget *, iAnyObject *child, enum iWidgetAddPos addPos);
+iAny *  addChildPosFlags_Widget     (iWidget *, iAnyObject *child, enum iWidgetAddPos addPos, int64_t childFlags);
 iAny *  addChildFlags_Widget        (iWidget *, iAnyObject *child, int64_t childFlags); /* holds a ref */
 iAny *  insertChildAfter_Widget     (iWidget *, iAnyObject *child, size_t afterIndex);
 iAny *  insertChildAfterFlags_Widget(iWidget *, iAnyObject *child, size_t afterIndex, int64_t childFlags);