Centering widgets and sheet contents

Added a new arrange flag for centering a child horizontally.

The two-column layout in Preferences has expanding vertical paddings so the page contents are vertically centered.

3 files changed, 49 insertions, 12 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index a47b33c4..51c83a8b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -474,9 +474,13 @@ iWidget *removeTabPage_Widget(iWidget *tabs, size_t index) {
 void resizeToLargestPage_Widget(iWidget *tabs) {
     arrange_Widget(tabs);
     iInt2 largest = zero_I2();
-    iConstForEach(ObjectList, i, children_Widget(findChild_Widget(tabs, "tabs.pages"))) {
+    iWidget *pages = findChild_Widget(tabs, "tabs.pages");
+    iConstForEach(ObjectList, i, children_Widget(pages)) {
         largest = max_I2(largest, ((const iWidget *) i.object)->rect.size);
     }
+    iForEach(ObjectList, j, children_Widget(pages)) {
+        setSize_Widget(j.object, largest);
+    }
     setSize_Widget(tabs, addY_I2(largest, height_Widget(findChild_Widget(tabs, "tabs.buttons"))));
 }
 
@@ -602,16 +606,17 @@ iWidget *makeSheet_Widget(const char *id) {
                     mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
                         arrangeSize_WidgetFlag,
                     iTrue);
+    setFlags2_Widget(sheet, centerHorizontal_WidgetFlag2, iTrue);
     return sheet;
 }
 
 void centerSheet_Widget(iWidget *sheet) {
-    arrange_Widget(sheet);
-    const iInt2 rootSize = rootSize_Window(get_Window());
-    const iInt2 orig     = localCoord_Widget(
-        sheet->parent,
-        init_I2(rootSize.x / 2 - sheet->rect.size.x / 2, bounds_Widget(sheet).pos.y));
-    sheet->rect.pos = orig;
+    arrange_Widget(sheet->parent);
+//    const iInt2 rootSize = rootSize_Window(get_Window());
+//    const iInt2 orig     = localCoord_Widget(
+//        sheet->parent,
+//        init_I2(rootSize.x / 2 - sheet->rect.size.x / 2, bounds_Widget(sheet).pos.y));
+//    sheet->rect.pos = orig;
     postRefresh_App();
 }
 
@@ -815,12 +820,17 @@ iWidget *makeToggle_Widget(const char *id) {
 static iWidget *appendTwoColumnPage_(iWidget *tabs, const char *title, iWidget **headings,
                                      iWidget **values) {
     iWidget *page = new_Widget();
-    appendTabPage_Widget(tabs, page, title, 0, 0);
-    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+    setFlags_Widget(page, arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
+                    resizeHeightOfChildren_WidgetFlag, iTrue);
+    addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);
+    iWidget *columns = new_Widget();
+    addChildFlags_Widget(page, iClob(columns), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     *headings = addChildFlags_Widget(
-        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+        columns, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     *values = addChildFlags_Widget(
-        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+        columns, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);
+    appendTabPage_Widget(tabs, page, title, 0, 0);
     return page;
 }
 
@@ -831,7 +841,7 @@ static void makeTwoColumnHeading_(const char *title, iWidget *headings, iWidget
 }
 
 static void expandInputFieldWidth_(iInputWidget *input) {
-    iWidget *page = as_Widget(input)->parent->parent->parent; /* tabs > page > values > input */
+    iWidget *page = as_Widget(input)->parent->parent->parent->parent; /* tabs > page > values > input */
     as_Widget(input)->rect.size.x =
         right_Rect(bounds_Widget(page)) - left_Rect(bounds_Widget(constAs_Widget(input)));
     printf("expand to %s, %d - %d\n", cstr_String(id_Widget(page)),
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 05bb62cc..cace9568 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -71,6 +71,7 @@ iDefineObjectConstruction(Widget)
 void init_Widget(iWidget *d) {
     init_String(&d->id);
     d->flags          = 0;
+    d->flags2         = 0;
     d->rect           = zero_Rect();
     d->bgColor        = none_ColorId;
     d->frameColor     = none_ColorId;
@@ -135,6 +136,10 @@ void setFlags_Widget(iWidget *d, int flags, iBool set) {
     }
 }
 
+void setFlags2_Widget(iWidget *d, int flags2, iBool set) {
+    iChangeFlags(d->flags2, flags2, set);
+}
+
 void setPos_Widget(iWidget *d, iInt2 pos) {
     d->rect.pos = pos;
     setFlags_Widget(d, fixedPosition_WidgetFlag, iTrue);
@@ -228,6 +233,13 @@ static size_t numArrangedChildren_Widget_(const iWidget *d) {
     return count;
 }
 
+static void centerHorizontal_Widget_(iWidget *d) {
+    d->rect.pos.x = ((d->parent ? width_Rect(innerRect_Widget_(d->parent))
+                                : rootSize_Window(get_Window()).x) -
+                     width_Rect(d->rect)) /
+                    2;
+}
+
 void arrange_Widget(iWidget *d) {
     if (isCollapsed_Widget_(d)) {
         setFlags_Widget(d, wasCollapsed_WidgetFlag, iTrue);
@@ -236,6 +248,9 @@ void arrange_Widget(iWidget *d) {
     if (d->flags & moveToParentRightEdge_WidgetFlag) {
         d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
     }
+    if (d->flags2 & centerHorizontal_WidgetFlag2) {
+        centerHorizontal_Widget_(d);
+    }
     if (d->flags & resizeToParentWidth_WidgetFlag) {
         setWidth_Widget_(d, width_Rect(innerRect_Widget_(d->parent)));
     }
@@ -351,6 +366,9 @@ void arrange_Widget(iWidget *d) {
         if (child->flags & fixedPosition_WidgetFlag) {
             continue;
         }
+        if (child->flags2 & centerHorizontal_WidgetFlag2) {
+            continue;
+        }
         if (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag)) {
             if (child->flags & moveToParentRightEdge_WidgetFlag) {
                 continue; /* Not part of the sequential arrangement .*/
@@ -401,6 +419,9 @@ void arrange_Widget(iWidget *d) {
                 }
             }
         }
+        if (d->flags2 & centerHorizontal_WidgetFlag2) {
+            centerHorizontal_Widget_(d);
+        }
     }
 }
 
diff --git a/src/ui/widget.h b/src/ui/widget.h
index cc6d774e..34e46c0b 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -82,6 +82,10 @@ enum iWidgetFlag {
     fixedSize_WidgetFlag      = fixedWidth_WidgetFlag | fixedHeight_WidgetFlag,
 };
 
+enum iWidgetFlag2 {
+    centerHorizontal_WidgetFlag2 = iBit(1),
+};
+
 enum iWidgetAddPos {
     back_WidgetAddPos,
     front_WidgetAddPos,
@@ -96,6 +100,7 @@ struct Impl_Widget {
     iObject      object;
     iString      id;
     int          flags;
+    int          flags2;
     iRect        rect;
     int          padding[4]; /* left, top, right, bottom */
     int          bgColor;
@@ -166,6 +171,7 @@ iBool   isCommand_Widget    (const iWidget *d, const SDL_Event *ev, const char *
 iBool   hasParent_Widget    (const iWidget *d, const iWidget *someParent);
 void    setId_Widget        (iWidget *, const char *id);
 void    setFlags_Widget     (iWidget *, int flags, iBool set);
+void    setFlags2_Widget    (iWidget *, int flags2, 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);