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

Timestamp:

Oct 13, 2001, 7:57:58 PM (24 years ago)

Author:

umoeller

Message:

Lots of updates from the last week for conditional compiles and other stuff.

File:

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

trunk/src/helpers/dialog.c

@@ -227 +227 @@
 
 /*
- *@@ CalcAutoSizeText:
- *
- *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed various things with statics
- *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed broken fonts
- *@@changed V0.9.14 (2001-08-01) [umoeller]: now caching fonts, which is significantly faster
- */
-
-VOID CalcAutoSizeText(PCONTROLDEF pControlDef,
-                      BOOL fMultiLine,          // in: if TRUE, multiple lines
-                      PSIZEL pszlAuto,          // out: computed size
-                      PDLGPRIVATE pDlgData)
-{
+ *@@ SetDlgFont:
+ *
+ *@@added V0.9.16 (2001-10-11) [umoeller]
+ */
+
+VOID SetDlgFont(PCONTROLDEF pControlDef,
+                PDLGPRIVATE pDlgData)
+{
+    LONG lPointSize = 0;
     const char *pcszFontThis = pControlDef->pcszFont;
                     // can be NULL,
@@ -249 +246 @@
         pDlgData->hps = WinGetPS(pDlgData->hwndDlg);
 
-    if (pcszFontThis)
-    {
-        LONG lPointSize = 0;
-
-        // check if we can reuse font data from last time
-        // V0.9.14 (2001-08-01) [umoeller]
-        if (strhcmp(pcszFontThis,
-                    pDlgData->pcszFontLast))
-        {
-            // different font than last time:
-
-            // delete old font?
-            if (pDlgData->lcidLast)
-            {
-                GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);
-                GpiDeleteSetId(pDlgData->hps, pDlgData->lcidLast);
-            }
-
+    // check if we can reuse font data from last time
+    // V0.9.14 (2001-08-01) [umoeller]
+    if (strhcmp(pcszFontThis,               // can be NULL!
+                pDlgData->pcszFontLast))
+    {
+        // different font than last time:
+
+        // delete old font?
+        if (pDlgData->lcidLast)
+        {
+            GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);     // LCID_DEFAULT == 0
+            GpiDeleteSetId(pDlgData->hps, pDlgData->lcidLast);
+        }
+
+        if (pcszFontThis)
+        {
             // create new font
             pDlgData->lcidLast = gpihFindPresFont(NULLHANDLE,        // no window yet
@@ -278 +273 @@
             if (pDlgData->fmLast.fsDefn & FM_DEFN_OUTLINE)
                 gpihSetPointSize(pDlgData->hps, lPointSize);
-
-            pDlgData->pcszFontLast = pcszFontThis;
-        }
-
-        pszlAuto->cy =   pDlgData->fmLast.lMaxBaselineExt
-                       + pDlgData->fmLast.lExternalLeading;
-    }
+        }
+        else
+        {
+            // use default font:
+            // @@todo handle presparams, maybe inherited?
+            GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);
+            GpiQueryFontMetrics(pDlgData->hps,
+                                sizeof(pDlgData->fmLast),
+                                &pDlgData->fmLast);
+        }
+
+        pDlgData->pcszFontLast = pcszFontThis;      // can be NULL
+    }
+}
+
+/*
+ *@@ CalcAutoSizeText:
+ *
+ *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed various things with statics
+ *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed broken fonts
+ *@@changed V0.9.14 (2001-08-01) [umoeller]: now caching fonts, which is significantly faster
+ */
+
+VOID CalcAutoSizeText(PCONTROLDEF pControlDef,
+                      BOOL fMultiLine,          // in: if TRUE, multiple lines
+                      PSIZEL pszlAuto,          // out: computed size
+                      PDLGPRIVATE pDlgData)
+{
+    SetDlgFont(pControlDef, pDlgData);
+
+    pszlAuto->cy =   pDlgData->fmLast.lMaxBaselineExt
+                   + pDlgData->fmLast.lExternalLeading;
 
     // ok, we FINALLY have a font now...
@@ -396 +416 @@
             }
         break;
+
+        default:
+            // any other control (just to be safe):
+            SetDlgFont(pControlDef, pDlgData);
+            pszlAuto->cx = 50;
+            pszlAuto->cy =   pDlgData->fmLast.lMaxBaselineExt
+                           + pDlgData->fmLast.lExternalLeading
+                           + 5;         // some space
     }
 }
@@ -566 +594 @@
     LHANDLE     lHandleSet = NULLHANDLE;
     ULONG       flOld = 0;
+
+    LONG        y, cy;              // for combo box hacks
 
     if (pColumnDef->fIsNestedTable)
@@ -588 +618 @@
                 pcszTitle = pControlDef->pcszText;
                 flStyle = pControlDef->flStyle;
+
+                y = pcp->y + pDlgData->ptlTotalOfs.y;
+                cy = pcp->cy;
             }
         }
@@ -598 +631 @@
         pcszTitle = pControlDef->pcszText;
         flStyle = pControlDef->flStyle;
+
+        y = pcp->y + pDlgData->ptlTotalOfs.y;
+        cy = pcp->cy;
 
         // change the title if this is a static with SS_BITMAP;
@@ -613 +649 @@
             pcszTitle = "";
             lHandleSet = (LHANDLE)pControlDef->pcszText;
+        }
+        // hack the stupid drop-down combobox which doesn't
+        // expand otherwise (the size of the drop-down is
+        // the full size of the control... duh)
+        else if (    ((ULONG)pControlDef->pcszClass == 0xffff0002L)
+                  && (flStyle & (CBS_DROPDOWN | CBS_DROPDOWNLIST))
+                )
+        {
+            y -= 100;
+            cy += 100;
         }
     }
@@ -640 +686 @@
                               flStyle,      // hacked
                               pcp->x + pDlgData->ptlTotalOfs.x,
-                              pcp->y + pDlgData->ptlTotalOfs.y,
+                              y,
                               pcp->cx,
-                              pcp->cy,
+                              cy,
                               pDlgData->hwndDlg,   // owner
                               HWND_BOTTOM,