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

Timestamp:

Apr 6, 2001, 7:12:11 PM (24 years ago)

Author:

umoeller

Message:

misc changes

File:

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

trunk/src/helpers/dialog.c

@@ -157 +157 @@
 typedef struct _ROWDEF
 {
-    PTABLEDEF   pOwningTable;   // table whose linked list this row belongs to
-
-    LINKLIST    llColumns;      // contains COLUMNDEF structs, no auto-free
+    PTABLEDEF   pOwningTable;       // table whose linked list this row belongs to
+
+    LINKLIST    llColumns;          // contains COLUMNDEF structs, no auto-free
+
+    ULONG       flRowFormat;        // one of:
+                                    // -- ROW_VALIGN_BOTTOM           0x0000
+                                    // -- ROW_VALIGN_CENTER           0x0001
+                                    // -- ROW_VALIGN_TOP              0x0002
 
     CONTROLPOS  cpRow;
@@ -188 +193 @@
 {
     PROCESS_CALC_SIZES,             // step 1
-    PROCESS_CALC_POSITIONS,         // step 2
-    PROCESS_CREATE_CONTROLS         // step 3
+    PROCESS_CALC_POSITIONS,         // step 3
+    PROCESS_CREATE_CONTROLS         // step 4
 } PROCESSMODE;
 
@@ -212 +217 @@
 
 VOID CalcAutoSizeText(PCONTROLDEF pControlDef,
+                      BOOL fMultiLine,          // in: if TRUE, multiple lines
                       PSIZEL pszlAuto,          // out: computed size
                       PDLGPRIVATE pDlgData)
@@ -265 +271 @@
     if (pControlDef->pcszText)
     {
-        POINTL aptl[TXTBOX_COUNT];
-        GpiQueryTextBox(pDlgData->hps,
-                        strlen(pControlDef->pcszText),
-                        (PCH)pControlDef->pcszText,
-                        TXTBOX_COUNT,
-                        aptl);
-        pszlAuto->cx = aptl[TXTBOX_TOPRIGHT].x - aptl[TXTBOX_BOTTOMLEFT].x;
+        // do we have multiple lines?
+        if (fMultiLine)
+        {
+            RECTL rcl = {0, 0, 1000, 1000};
+            winhDrawFormattedText(pDlgData->hps,
+                                  &rcl,
+                                  pControlDef->pcszText,
+                                  DT_LEFT | DT_TOP | DT_WORDBREAK | DT_QUERYEXTENT);
+            pszlAuto->cx = rcl.xRight - rcl.xLeft;
+            pszlAuto->cy = rcl.yTop - rcl.yBottom;
+        }
+        else
+        {
+            POINTL aptl[TXTBOX_COUNT];
+            GpiQueryTextBox(pDlgData->hps,
+                            strlen(pControlDef->pcszText),
+                            (PCH)pControlDef->pcszText,
+                            TXTBOX_COUNT,
+                            aptl);
+            pszlAuto->cx = aptl[TXTBOX_TOPRIGHT].x - aptl[TXTBOX_BOTTOMLEFT].x;
+        }
     }
 }
@@ -292 +312 @@
         case 0xffff0003L: // WC_BUTTON:
             CalcAutoSizeText(pControlDef,
+                             FALSE,         // no multiline
                              pszlAuto,
                              pDlgData);
@@ -316 +337 @@
             if (pControlDef->flStyle & SS_TEXT)
                 CalcAutoSizeText(pControlDef,
+                                 ((pControlDef->flStyle & DT_WORDBREAK) != 0),
                                  pszlAuto,
                                  pDlgData);
@@ -384 +406 @@
     pColumnDef->pOwningRow = pOwningRow;
 
-    // for PROCESS_CALC_SIZES: have control return its size
-    //      plus spacings into szlControl
-    // for PROCESS_CALC_POSITIONS: have control compute its
-    //      position from the column position (there may be
-    //      spacings)
-    // for PROCESS_CREATE_CONTROLS: well, create the control
     switch (ProcessMode)
     {
+        /*
+         * PROCESS_CALC_SIZES:
+         *      step 1.
+         */
+
         case PROCESS_CALC_SIZES:
         {
@@ -454 +475 @@
         break; }
 
+        /*
+         * PROCESS_CALC_POSITIONS:
+         *      step 2.
+         */
+
         case PROCESS_CALC_POSITIONS:
         {
@@ -459 +485 @@
             ULONG ulSpacing = 0;
 
-            // column position = *plX
+            // column position = *plX on ProcessRow stack
             pColumnDef->cpColumn.x = *plX;
             pColumnDef->cpColumn.y = pOwningRow->cpRow.y;
+
+            // check vertical alignment of row;
+            // we might need to increase column y
+            switch (pOwningRow->flRowFormat & ROW_VALIGN_MASK)
+            {
+                // case ROW_VALIGN_BOTTOM:      // do nothing
+
+                case ROW_VALIGN_CENTER:
+                    if (pColumnDef->cpColumn.cy < pOwningRow->cpRow.cy)
+                        pColumnDef->cpColumn.y
+                            += (   (pOwningRow->cpRow.cy - pColumnDef->cpColumn.cy)
+                                 / 2);
+                break;
+
+                case ROW_VALIGN_TOP:
+                    if (pColumnDef->cpColumn.cy < pOwningRow->cpRow.cy)
+                        pColumnDef->cpColumn.y
+                            += (pOwningRow->cpRow.cy - pColumnDef->cpColumn.cy);
+                break;
+            }
 
             if (pColumnDef->fIsNestedTable)
@@ -481 +527 @@
             *plX += pColumnDef->cpColumn.cx;
 
-            // calculate control pos by applying spacing
+            // calculate CONTROL pos from COLUMN pos by applying spacing
             pColumnDef->cpControl.x =   pColumnDef->cpColumn.x
                                       + ulSpacing;
@@ -499 +545 @@
             }
         break; }
+
+        /*
+         * PROCESS_CREATE_CONTROLS:
+         *      step 3.
+         */
 
         case PROCESS_CREATE_CONTROLS:
@@ -1176 +1227 @@
                         lstInit(&pCurrentRow->llColumns, FALSE);
 
+                        pCurrentRow->flRowFormat = pItemThis->ulData;
+
                         lstAppendItem(&pCurrentTable->llRows, pCurrentRow);
                     }