Widget: Expanded flags to 64 bits

Ran out of room in 32 bits, more flags needed for arranging.

4 files changed, 45 insertions, 54 deletions

diff --git a/lib/the_Foundation b/lib/the_Foundation
-Subproject ab8f6e0769db2ec74846beea0f36561b85bf2c7
+Subproject 4b041220b889a65e0dd5ec861e3c6982c968f0f
diff --git a/src/ui/util.c b/src/ui/util.c
index 51c83a8b..bdc1c813 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -604,9 +604,8 @@ iWidget *makeSheet_Widget(const char *id) {
     setBackgroundColor_Widget(sheet, uiBackground_ColorId);
     setFlags_Widget(sheet,
                     mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
-                        arrangeSize_WidgetFlag,
+                        arrangeSize_WidgetFlag | centerHorizontal_WidgetFlag,
                     iTrue);
-    setFlags2_Widget(sheet, centerHorizontal_WidgetFlag2, iTrue);
     return sheet;
 }
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index cace9568..d218d7ee 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -71,7 +71,6 @@ 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;
@@ -120,11 +119,11 @@ const iString *id_Widget(const iWidget *d) {
     return &d->id;
 }
 
-int flags_Widget(const iWidget *d) {
+int64_t flags_Widget(const iWidget *d) {
     return d->flags;
 }
 
-void setFlags_Widget(iWidget *d, int flags, iBool set) {
+void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
     iChangeFlags(d->flags, flags, set);
     if (flags & keepOnTop_WidgetFlag) {
         if (set) {
@@ -136,10 +135,6 @@ 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);
@@ -248,7 +243,7 @@ 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) {
+    if (d->flags & centerHorizontal_WidgetFlag) {
         centerHorizontal_Widget_(d);
     }
     if (d->flags & resizeToParentWidth_WidgetFlag) {
@@ -366,7 +361,7 @@ void arrange_Widget(iWidget *d) {
         if (child->flags & fixedPosition_WidgetFlag) {
             continue;
         }
-        if (child->flags2 & centerHorizontal_WidgetFlag2) {
+        if (child->flags & centerHorizontal_WidgetFlag) {
             continue;
         }
         if (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag)) {
@@ -419,7 +414,7 @@ void arrange_Widget(iWidget *d) {
                 }
             }
         }
-        if (d->flags2 & centerHorizontal_WidgetFlag2) {
+        if (d->flags & centerHorizontal_WidgetFlag) {
             centerHorizontal_Widget_(d);
         }
     }
@@ -637,7 +632,7 @@ iAny *addChildPos_Widget(iWidget *d, iAnyObject *child, enum iWidgetAddPos addPo
     return child;
 }
 
-iAny *addChildFlags_Widget(iWidget *d, iAnyObject *child, int childFlags) {
+iAny *addChildFlags_Widget(iWidget *d, iAnyObject *child, int64_t childFlags) {
     setFlags_Widget(child, childFlags, iTrue);
     return addChild_Widget(d, child);
 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 34e46c0b..a2be30e9 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -44,47 +44,46 @@ iBeginDeclareClass(Widget)
 iEndDeclareClass(Widget)
 
 enum iWidgetFlag {
-    hidden_WidgetFlag         = iBit(1),
-    disabled_WidgetFlag       = iBit(2),
-    hover_WidgetFlag          = iBit(3), /* eligible for mouse hover */
-    selected_WidgetFlag       = iBit(4),
-    pressed_WidgetFlag        = iBit(5),
-    alignLeft_WidgetFlag      = iBit(6),
-    alignRight_WidgetFlag     = iBit(7),
-    frameless_WidgetFlag      = iBit(8),
-    commandOnClick_WidgetFlag = iBit(9),
-    drawKey_WidgetFlag        = iBit(10),
-    focusable_WidgetFlag      = iBit(11),
-    tight_WidgetFlag          = iBit(12), /* smaller padding */
-    keepOnTop_WidgetFlag      = iBit(13), /* gets events first; drawn last */
-    mouseModal_WidgetFlag     = iBit(14), /* eats all unprocessed mouse events */
-    commandOnMouseMiss_WidgetFlag = iBit(15),
-    /* arrange behavior */
-    fixedPosition_WidgetFlag               = iBit(16),
-    arrangeHorizontal_WidgetFlag           = iBit(17), /* arrange children horizontally */
-    arrangeVertical_WidgetFlag             = iBit(18), /* arrange children vertically */
-    arrangeWidth_WidgetFlag                = iBit(19), /* area of children becomes parent size */
-    arrangeHeight_WidgetFlag               = iBit(20), /* area of children becomes parent size */
-    resizeWidthOfChildren_WidgetFlag       = iBit(21),
-    resizeHeightOfChildren_WidgetFlag      = iBit(22),
-    expand_WidgetFlag                      = iBit(23),
-    fixedWidth_WidgetFlag                  = iBit(24),
-    fixedHeight_WidgetFlag                 = iBit(25),
-    resizeChildrenToWidestChild_WidgetFlag = iBit(26),
-    resizeToParentWidth_WidgetFlag         = iBit(27),
-    resizeToParentHeight_WidgetFlag        = iBit(28),
-    moveToParentRightEdge_WidgetFlag       = iBit(29),
-    collapse_WidgetFlag                    = iBit(30), /* when hidden, arrange size to zero */
-    wasCollapsed_WidgetFlag                = iBit(31),
+    hidden_WidgetFlag             = iBit(1),
+    disabled_WidgetFlag           = iBit(2),
+    hover_WidgetFlag              = iBit(3), /* eligible for mouse hover */
+    selected_WidgetFlag           = iBit(4),
+    pressed_WidgetFlag            = iBit(5),
+    alignLeft_WidgetFlag          = iBit(6),
+    alignRight_WidgetFlag         = iBit(7),
+    frameless_WidgetFlag          = iBit(8),
+    commandOnClick_WidgetFlag     = iBit(9),
+    commandOnMouseMiss_WidgetFlag = iBit(10),
+    drawKey_WidgetFlag            = iBit(11),
+    focusable_WidgetFlag          = iBit(12),
+    tight_WidgetFlag              = iBit(13), /* smaller padding */
+    keepOnTop_WidgetFlag          = iBit(14), /* gets events first; drawn last */
+    mouseModal_WidgetFlag         = iBit(15), /* eats all unprocessed mouse events */
+    /* arrangement */
+    fixedPosition_WidgetFlag               = iBit(17),
+    arrangeHorizontal_WidgetFlag           = iBit(18), /* arrange children horizontally */
+    arrangeVertical_WidgetFlag             = iBit(19), /* arrange children vertically */
+    arrangeWidth_WidgetFlag                = iBit(20), /* area of children becomes parent size */
+    arrangeHeight_WidgetFlag               = iBit(21), /* area of children becomes parent size */
+    resizeWidthOfChildren_WidgetFlag       = iBit(22),
+    resizeHeightOfChildren_WidgetFlag      = iBit(23),
+    expand_WidgetFlag                      = iBit(24),
+    fixedWidth_WidgetFlag                  = iBit(25),
+    fixedHeight_WidgetFlag                 = iBit(26),
+    resizeChildrenToWidestChild_WidgetFlag = iBit(27),
+    resizeToParentWidth_WidgetFlag         = iBit(28),
+    resizeToParentHeight_WidgetFlag        = iBit(29),
+    collapse_WidgetFlag                    = iBit(30), /* if hidden, arrange size to zero */
     /* combinations */
     arrangeSize_WidgetFlag    = arrangeWidth_WidgetFlag | arrangeHeight_WidgetFlag,
     resizeChildren_WidgetFlag = resizeWidthOfChildren_WidgetFlag | resizeHeightOfChildren_WidgetFlag,
     fixedSize_WidgetFlag      = fixedWidth_WidgetFlag | fixedHeight_WidgetFlag,
 };
 
-enum iWidgetFlag2 {
-    centerHorizontal_WidgetFlag2 = iBit(1),
-};
+/* 64-bit extended flags */
+#define wasCollapsed_WidgetFlag             iBit64(32)
+#define centerHorizontal_WidgetFlag         iBit64(33)
+#define moveToParentRightEdge_WidgetFlag    iBit64(34)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
@@ -99,8 +98,7 @@ enum iWidgetFocusDir {
 struct Impl_Widget {
     iObject      object;
     iString      id;
-    int          flags;
-    int          flags2;
+    int64_t      flags;
     iRect        rect;
     int          padding[4]; /* left, top, right, bottom */
     int          bgColor;
@@ -136,7 +134,7 @@ void    destroy_Widget      (iWidget *); /* widget removed and deleted later */
 void    destroyPending_Widget(void);
 
 const iString *id_Widget    (const iWidget *);
-int     flags_Widget        (const iWidget *);
+int64_t flags_Widget        (const iWidget *);
 iRect   bounds_Widget       (const iWidget *); /* outer bounds */
 iRect   innerBounds_Widget  (const iWidget *);
 iInt2   localCoord_Widget   (const iWidget *, iInt2 coord);
@@ -170,8 +168,7 @@ iBool   isSelected_Widget   (const iAnyObject *);
 iBool   isCommand_Widget    (const iWidget *d, const SDL_Event *ev, const char *cmd);
 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    setFlags_Widget     (iWidget *, int64_t 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);
@@ -181,7 +178,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 *  addChildFlags_Widget(iWidget *, iAnyObject *child, int childFlags); /* holds a ref */
+iAny *  addChildFlags_Widget(iWidget *, iAnyObject *child, int64_t childFlags); /* holds a ref */
 iAny *  removeChild_Widget  (iWidget *, iAnyObject *child); /* returns a ref */
 iAny *  child_Widget        (iWidget *, size_t index); /* O(n) */
 size_t  childIndex_Widget   (const iWidget *, const iAnyObject *child); /* O(n) */