3 files changed, 38 insertions, 28 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 52d5031e..c44fa37c 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -500,6 +500,7 @@ iBool filePathHandler_(iWidget *dlg, const char *cmd) {
 
 iWidget *makeSheet_Widget(const char *id) {
     iWidget *sheet = new_Widget();
+    setPadding1_Widget(sheet, 3 * gap_UI);
     setId_Widget(sheet, id);
     setFrameColor_Widget(sheet, uiSeparator_ColorId);
     setBackgroundColor_Widget(sheet, uiBackground_ColorId);
@@ -507,9 +508,6 @@ iWidget *makeSheet_Widget(const char *id) {
                     mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
                         arrangeSize_WidgetFlag,
                     iTrue);
-    //    const iInt2 rootSize = rootSize_Window(get_Window());
-    //    setSize_Widget(sheet, init_I2(rootSize.x / 2, 0));
-    //    setFlags_Widget(sheet, fixedHeight_WidgetFlag, iFalse);
     return sheet;
 }
 
@@ -787,7 +785,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
         addChild_Widget(
             div,
             iClob(new_LabelWidget(
-                uiTextCaution_ColorEscape "Save", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+                uiTextCaution_ColorEscape "Save Bookmark", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -865,20 +863,9 @@ iWidget *makeIdentityCreation_Widget(void) {
     addChild_Widget(headings, iClob(makeHeading_Widget("Valid until:")));
     iInputWidget *until;
     addChild_Widget(values, iClob(until = new_InputWidget(19)));
-    setTextCStr_InputWidget(until, "YYYY-MM-DD HH:MM:SS");
-//    addChild_Widget(headings, iClob(newEmpty_LabelWidget()));
-//    addChild_Widget(values,
-//                    iClob(newColor_LabelWidget("Time defaults to end of day.",
-//                                               uiAnnotation_ColorId)));
+    setHint_InputWidget(until, collectNewCStr_String("YYYY-MM-DD HH:MM:SS"));
     addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));
-//    iWidget *temp = new_Widget();
-//    addChildFlags_Widget(
-//        values, iClob(temp), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     addChild_Widget(values, iClob(makeToggle_Widget("ident.temp")));
-    //    addChild_Widget(
-    //        temp,
-    //        iClob(newColor_LabelWidget("Temporary identities are not saved.",
-    //        uiAnnotation_ColorId)));
     arrange_Widget(dlg);
     for (size_t i = 0; i < iElemCount(inputs); ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
@@ -889,7 +876,7 @@ iWidget *makeIdentityCreation_Widget(void) {
         addChild_Widget(
             div,
             iClob(new_LabelWidget(
-                uiTextAction_ColorEscape "Create", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
+                uiTextAction_ColorEscape "Create Identity", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1175b217..8277b921 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -76,6 +76,7 @@ void init_Widget(iWidget *d) {
     d->children       = NULL;
     d->parent         = NULL;
     d->commandHandler = NULL;
+    iZap(d->padding);
 }
 
 void deinit_Widget(iWidget *d) {
@@ -142,6 +143,13 @@ void setSize_Widget(iWidget *d, iInt2 size) {
     setFlags_Widget(d, fixedSize_WidgetFlag, iTrue);
 }
 
+void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
+    d->padding[0] = left;
+    d->padding[1] = top;
+    d->padding[2] = right;
+    d->padding[3] = bottom;
+}
+
 void setBackgroundColor_Widget(iWidget *d, int bgColor) {
     d->bgColor = bgColor;
 }
@@ -191,19 +199,26 @@ iLocalDef iBool isCollapsed_Widget_(const iWidget *d) {
            (hidden_WidgetFlag | collapse_WidgetFlag);
 }
 
+iLocalDef iRect innerRect_Widget_(const iWidget *d) {
+    return init_Rect(d->padding[0],
+                     d->padding[1],
+                     width_Rect(d->rect) - d->padding[0] - d->padding[2],
+                     height_Rect(d->rect) - d->padding[1] - d->padding[3]);
+}
+
 void arrange_Widget(iWidget *d) {
     if (isCollapsed_Widget_(d)) {
         setFlags_Widget(d, wasCollapsed_WidgetFlag, iTrue);
         return;
     }
     if (d->flags & moveToParentRightEdge_WidgetFlag) {
-        d->rect.pos.x = width_Rect(d->parent->rect) - width_Rect(d->rect);
+        d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
     }
     if (d->flags & resizeToParentWidth_WidgetFlag) {
-        setWidth_Widget_(d, d->parent->rect.size.x);
+        setWidth_Widget_(d, width_Rect(innerRect_Widget_(d->parent)));
     }
     if (d->flags & resizeToParentHeight_WidgetFlag) {
-        setHeight_Widget_(d, d->parent->rect.size.y);
+        setHeight_Widget_(d, height_Rect(innerRect_Widget_(d->parent)));
     }
     /* The rest of the arrangement depends on child widgets. */
     if (!d->children) {
@@ -236,7 +251,7 @@ void arrange_Widget(iWidget *d) {
         const int expCount = numExpandingChildren_Widget_(d);
         /* Only resize the expanding children, not touching the others. */
         if (expCount > 0) {
-            iInt2 avail = d->rect.size;
+            iInt2 avail = innerRect_Widget_(d).size;
             iConstForEach(ObjectList, i, d->children) {
                 const iWidget *child = constAs_Widget(i.object);
                 if (~child->flags & expand_WidgetFlag) {
@@ -250,27 +265,27 @@ void arrange_Widget(iWidget *d) {
                 if (child->flags & expand_WidgetFlag) {
                     if (d->flags & arrangeHorizontal_WidgetFlag) {
                         if (dirs.x) setWidth_Widget_(child, avail.x);
-                        if (dirs.y) setHeight_Widget_(child, d->rect.size.y);
+                        if (dirs.y) setHeight_Widget_(child, height_Rect(innerRect_Widget_(d)));
                     }
                     else if (d->flags & arrangeVertical_WidgetFlag) {
-                        if (dirs.x) setWidth_Widget_(child, d->rect.size.x);
+                        if (dirs.x) setWidth_Widget_(child, width_Rect(innerRect_Widget_(d)));
                         if (dirs.y) setHeight_Widget_(child, avail.y);
                     }
                 }
                 else {
                     /* Fill the off axis, though. */
                     if (d->flags & arrangeHorizontal_WidgetFlag) {
-                        if (dirs.y) setHeight_Widget_(child, d->rect.size.y);
+                        if (dirs.y) setHeight_Widget_(child, height_Rect(innerRect_Widget_(d)));
                     }
                     else if (d->flags & arrangeVertical_WidgetFlag) {
-                        if (dirs.x) setWidth_Widget_(child, d->rect.size.x);
+                        if (dirs.x) setWidth_Widget_(child, width_Rect(innerRect_Widget_(d)));
                     }
                 }
             }
         }
         else {
             /* Evenly size all children. */
-            iInt2 childSize = d->rect.size;
+            iInt2 childSize = innerRect_Widget_(d).size;
             if (d->flags & arrangeHorizontal_WidgetFlag) {
                 childSize.x /= childCount;
             }
@@ -292,7 +307,7 @@ void arrange_Widget(iWidget *d) {
             setWidth_Widget_(as_Widget(i.object), widest);
         }
     }
-    iInt2 pos = zero_I2();
+    iInt2 pos = initv_I2(d->padding);
     iForEach(ObjectList, i, d->children) {
         iWidget *child = as_Widget(i.object);
         arrange_Widget(child);
@@ -308,6 +323,9 @@ void arrange_Widget(iWidget *d) {
                 pos.y += child->rect.size.y;
             }
         }
+        else if (d->flags & resizeChildren_WidgetFlag) {
+            child->rect.pos = pos;
+        }
     }
     /* Update the size of the widget according to the arrangement. */
     if (d->flags & arrangeSize_WidgetFlag) {
@@ -321,6 +339,7 @@ void arrange_Widget(iWidget *d) {
                 bounds = union_Rect(bounds, child->rect);
             }
         }
+        adjustEdges_Rect(&bounds, -d->padding[1], d->padding[2], d->padding[3], -d->padding[0]);
         if (d->flags & arrangeWidth_WidgetFlag) {
             setWidth_Widget_(d, bounds.size.x);
             /* Parent size changed, must update the children.*/
diff --git a/src/ui/widget.h b/src/ui/widget.h
index b0022a38..3f03fc07 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -95,6 +95,7 @@ struct Impl_Widget {
     iString      id;
     int          flags;
     iRect        rect;
+    int          padding[4]; /* left, top, right, bottom */
     int          bgColor;
     int          frameColor;
     iObjectList *children;
@@ -129,7 +130,8 @@ void    destroyPending_Widget(void);
 
 const iString *id_Widget    (const iWidget *);
 int     flags_Widget        (const iWidget *);
-iRect   bounds_Widget       (const iWidget *);
+iRect   bounds_Widget       (const iWidget *); /* outer bounds */
+iRect   innerBounds_Widget  (const iWidget *);
 iInt2   localCoord_Widget   (const iWidget *, iInt2 coord);
 iBool   contains_Widget     (const iWidget *, iInt2 coord);
 iAny *  findChild_Widget    (const iWidget *, const char *id);
@@ -153,6 +155,8 @@ void    setId_Widget        (iWidget *, const char *id);
 void    setFlags_Widget     (iWidget *, int flags, iBool set);
 void    setPos_Widget       (iWidget *, iInt2 pos);
 void    setSize_Widget      (iWidget *, iInt2 size);
+void    setPadding_Widget   (iWidget *, int left, int top, int right, int bottom);
+iLocalDef void setPadding1_Widget   (iWidget *d, int padding) { setPadding_Widget(d, padding, padding, padding, padding); }
 void    setBackgroundColor_Widget   (iWidget *, int bgColor);
 void    setFrameColor_Widget        (iWidget *, int frameColor);
 void    setCommandHandler_Widget    (iWidget *, iBool (*handler)(iWidget *, const char *));