Mercurial > dwindows

diff mac/dw.m @ 2740:9be24001d288

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. Also convert SIZEEXPAND/STATIC and TYPEBOX/ITEM to the new format based on our new style guidelines. as _DW_SIZE_EXPAND/STATIC and _DW_TYPE_BOX/ITEM.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 19 Dec 2021 15:39:43 +0000
parents cff8f6b6e302
children ee1cfa7d645e
line wrap: on
line diff
--- a/mac/dw.m	Sat Dec 18 19:31:57 2021 +0000
+++ b/mac/dw.m	Sun Dec 19 15:39:43 2021 +0000
@@ -991,7 +991,7 @@
     {
         box = calloc(1, sizeof(Box));
         box->type = DW_VERT;
-        box->vsize = box->hsize = SIZEEXPAND;
+        box->vsize = box->hsize = _DW_SIZE_EXPAND;
         box->width = box->height = 1;
     }
     return self;
@@ -1675,7 +1675,7 @@
 
         for(z=0;z<thisbox->count;z++)
         {
-            if(thisbox->items[z].type != TYPEBOX)
+            if(thisbox->items[z].type != _DW_TYPE_BOX)
             {
                 id object = thisbox->items[z].hwnd;
 
@@ -3683,7 +3683,7 @@
     {
         id handle = thisbox->items[z].hwnd;
 
-        if(thisbox->items[z].type == TYPEBOX)
+        if(thisbox->items[z].type == _DW_TYPE_BOX)
         {
             Box *tmp = (Box *)[handle box];
 
@@ -3802,7 +3802,7 @@
     {
         int itempad, itemwidth, itemheight;
 
-        if(thisbox->items[z].type == TYPEBOX)
+        if(thisbox->items[z].type == _DW_TYPE_BOX)
         {
             id box = thisbox->items[z].hwnd;
             Box *tmp = (Box *)[box box];
@@ -3845,7 +3845,7 @@
             if(itemwidth > uxmax)
                 uxmax = itemwidth;
 
-            if(thisbox->items[z].hsize != SIZEEXPAND)
+            if(thisbox->items[z].hsize != _DW_SIZE_EXPAND)
             {
                 if(itemwidth > upxmax)
                     upxmax = itemwidth;
@@ -3856,7 +3856,7 @@
                     upxmax = itempad;
             }
             thisbox->minheight += itemheight;
-            if(thisbox->items[z].vsize != SIZEEXPAND)
+            if(thisbox->items[z].vsize != _DW_SIZE_EXPAND)
                 thisbox->usedpady += itemheight;
             else
                 thisbox->usedpady += itempad;
@@ -3865,7 +3865,7 @@
         {
             if(itemheight > uymax)
                 uymax = itemheight;
-            if(thisbox->items[z].vsize != SIZEEXPAND)
+            if(thisbox->items[z].vsize != _DW_SIZE_EXPAND)
             {
                 if(itemheight > upymax)
                     upymax = itemheight;
@@ -3876,7 +3876,7 @@
                     upymax = itempad;
             }
             thisbox->minwidth += itemwidth;
-            if(thisbox->items[z].hsize != SIZEEXPAND)
+            if(thisbox->items[z].hsize != _DW_SIZE_EXPAND)
                 thisbox->usedpadx += itemwidth;
             else
                 thisbox->usedpadx += itempad;
@@ -3900,7 +3900,7 @@
             int thispad = thisbox->pad * 2;
 
             /* Calculate the new sizes */
-            if(thisbox->items[z].hsize == SIZEEXPAND)
+            if(thisbox->items[z].hsize == _DW_SIZE_EXPAND)
             {
                 if(thisbox->type == DW_HORZ)
                 {
@@ -3912,7 +3912,7 @@
                 else
                     width = x - (itempad + thispad + thisbox->grouppadx);
             }
-            if(thisbox->items[z].vsize == SIZEEXPAND)
+            if(thisbox->items[z].vsize == _DW_SIZE_EXPAND)
             {
                 if(thisbox->type == DW_VERT)
                 {
@@ -3941,7 +3941,7 @@
                 [handle setFrameSize:size];
 
                 /* After placing a box... place its components */
-                if(thisbox->items[z].type == TYPEBOX)
+                if(thisbox->items[z].type == _DW_TYPE_BOX)
                 {
                     id box = thisbox->items[z].hwnd;
                     Box *tmp = (Box *)[box box];
@@ -5132,27 +5132,27 @@
 
     /* Fill in the item data appropriately */
     if([object isKindOfClass:[DWBox class]] || [object isMemberOfClass:[DWGroupBox class]])
-       tmpitem[index].type = TYPEBOX;
+       tmpitem[index].type = _DW_TYPE_BOX;
     else
     {
-        if ( width == 0 && hsize == FALSE )
+        if(width == 0 && hsize == FALSE)
             dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
-        if ( height == 0 && vsize == FALSE )
+        if(height == 0 && vsize == FALSE)
             dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
 
-        tmpitem[index].type = TYPEITEM;
+        tmpitem[index].type = _DW_TYPE_ITEM;
     }
 
     tmpitem[index].hwnd = item;
     tmpitem[index].origwidth = tmpitem[index].width = width;
     tmpitem[index].origheight = tmpitem[index].height = height;
     tmpitem[index].pad = pad;
-    tmpitem[index].hsize = hsize ? SIZEEXPAND : SIZESTATIC;
-    tmpitem[index].vsize = vsize ? SIZEEXPAND : SIZESTATIC;
+    tmpitem[index].hsize = hsize ? _DW_SIZE_EXPAND : _DW_SIZE_STATIC;
+    tmpitem[index].vsize = vsize ? _DW_SIZE_EXPAND : _DW_SIZE_STATIC;
 
     /* If either of the parameters are -1 ... calculate the size */
-    if(width == -1 || height == -1)
-        _dw_control_size(object, width == -1 ? &tmpitem[index].width : NULL, height == -1 ? &tmpitem[index].height : NULL);
+    if(width == DW_SIZE_AUTO || height ==  DW_SIZE_AUTO)
+        _dw_control_size(object, width == DW_SIZE_AUTO ? &tmpitem[index].width : NULL, height == DW_SIZE_AUTO ? &tmpitem[index].height : NULL);
 
     thisbox->items = tmpitem;
 
@@ -10445,9 +10445,9 @@
         Item *item = _dw_box_item(handle);
 
         /* Check to see if any of the sizes need to be recalculated */
-        if(item && (item->origwidth == -1 || item->origheight == -1))
-        {
-            _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+        if(item && (item->origwidth == DW_SIZE_AUTO || item->origheight == DW_SIZE_AUTO))
+        {
+            _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
             /* Queue a redraw on the top-level window */
             _dw_redraw([object window], TRUE);
         }
@@ -10643,19 +10643,19 @@
     Item *item = _dw_box_item(handle);
 
     /* Check to see if any of the sizes need to be recalculated */
-    if(item && (item->origwidth == -1 || item->origheight == -1))
+    if(item && (item->origwidth == DW_SIZE_AUTO || item->origheight == DW_SIZE_AUTO))
     {
       int newwidth, newheight;
 
       _dw_control_size(handle, &newwidth, &newheight);
 
       /* Only update the item and redraw the window if it changed */
-      if((item->origwidth == -1 && item->width != newwidth) ||
-         (item->origheight == -1 && item->height != newheight))
+      if((item->origwidth == DW_SIZE_AUTO && item->width != newwidth) ||
+         (item->origheight == DW_SIZE_AUTO && item->height != newheight))
       {
-         if(item->origwidth == -1)
+         if(item->origwidth == DW_SIZE_AUTO)
             item->width = newwidth;
-         if(item->origheight == -1)
+         if(item->origheight == DW_SIZE_AUTO)
             item->height = newheight;
          /* Queue a redraw on the top-level window */
          _dw_redraw([object window], TRUE);
@@ -10776,9 +10776,9 @@
             Item *item = _dw_box_item(handle);
 
             /* Check to see if any of the sizes need to be recalculated */
-            if(item && (item->origwidth == -1 || item->origheight == -1))
-            {
-                _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+            if(item && (item->origwidth == DW_SIZE_AUTO || item->origheight == DW_SIZE_AUTO))
+            {
+                _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
                 /* Queue a redraw on the top-level window */
                 _dw_redraw([object window], TRUE);
             }
@@ -10834,9 +10834,9 @@
             Item *item = _dw_box_item(handle);
 
             /* Check to see if any of the sizes need to be recalculated */
-            if(item && (item->origwidth == -1 || item->origheight == -1))
-            {
-                _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+            if(item && (item->origwidth == DW_SIZE_AUTO || item->origheight == DW_SIZE_AUTO))
+            {
+                _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
                 /* Queue a redraw on the top-level window */
                 _dw_redraw([object window], TRUE);
             }