Changeset 136 for trunk/src/helpers/dialog.c

Timestamp:

Feb 3, 2002, 11:46:54 AM (24 years ago)

Author:

umoeller

Message:

Buncha fixes.

File:

• trunk/src/helpers/dialog.c (modified) (6 diffs)

trunk/src/helpers/dialog.c

@@ -317 +317 @@
         {
             RECTL rcl = {0, 0, 0, 0};
-            if (pControlDef->szlControlProposed.cx != -1)
+            if (pControlDef->szlControlProposed.cx > 0)
                 rcl.xRight = pControlDef->szlControlProposed.cx;   // V0.9.12 (2001-05-31) [umoeller]
             else
                 rcl.xRight = winhQueryScreenCX() * 2 / 3;
-            if (pControlDef->szlControlProposed.cy != -1)
+            if (pControlDef->szlControlProposed.cy > 0)
                 rcl.yTop = pControlDef->szlControlProposed.cy;   // V0.9.12 (2001-05-31) [umoeller]
             else
@@ -451 +451 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: fixed ugly group table spacings
  *@@changed V0.9.16 (2001-10-15) [umoeller]: added APIRET
+ *@@changed V0.9.16 (2002-02-02) [umoeller]: added support for explicit group size
  */
 
@@ -476 +477 @@
             if (pTableDef->pCtlDef)
             {
-                // yes: make this wider
+                // yes:
+
+                // check if maybe an explicit size was specified
+                // for the group; if that is larger than what
+                // we've calculated above, use it instead
+                if (pTableDef->pCtlDef->szlControlProposed.cx > pColumnDef->cpControl.cx)
+                        // should be -1 for auto-size
+                    pColumnDef->cpControl.cx = pTableDef->pCtlDef->szlControlProposed.cx;
+
+                if (pTableDef->pCtlDef->szlControlProposed.cy > pColumnDef->cpControl.cy)
+                        // should be -1 for auto-size
+                    pColumnDef->cpControl.cy = pTableDef->pCtlDef->szlControlProposed.cy;
+
+                // in any case, make this wider
                 ulXSpacing =    2 * PM_GROUP_SPACING_X;
                 ulYSpacing =    // 3 * PM_GROUP_SPACING_X;
@@ -490 +504 @@
         SIZEL       szlAuto;
 
-        if (    (pszl->cx == -1)
-             || (pszl->cy == -1)
+        if (    (pszl->cx < -1)
+             && (pszl->cx >= -100)
            )
+        {
+            // other negative CX value:
+            // this is then a percentage of the row width... ignore for now
+            // V0.9.16 (2002-02-02) [umoeller]
+            szlAuto.cx = 0;
+            szlAuto.cy = 0;
+        }
+        else if (    (pszl->cx == -1)
+                  || (pszl->cy == -1)
+                )
         {
             arc = CalcAutoSize(pControlDef,
@@ -501 +525 @@
         if (!arc)
         {
-            if (pszl->cx == -1)
+            if (pszl->cx < 0)
                 pColumnDef->cpControl.cx = szlAuto.cx;
             else
                 pColumnDef->cpControl.cx = pszl->cx;
 
-            if (pszl->cy == -1)
+            if (pszl->cy < 0)
                 pColumnDef->cpControl.cy = szlAuto.cy;
             else
@@ -1098 +1122 @@
             if (ProcessMode == PROCESS_CALC_SIZES)
             {
+                // all sizes have now been computed:
                 pszlClient->cx += pTableDefThis->cpTable.cx;
                 pszlClient->cy += pTableDefThis->cpTable.cy;