Changeset 1526 for trunk/src/user32/win32dlg.cpp

Timestamp:

Oct 31, 1999, 2:14:44 AM (26 years ago)

Author:

sandervl

Message:

Window size + paint fix + dialog fixes

File:

• trunk/src/user32/win32dlg.cpp (modified) (7 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.25 1999-10-30 18:40:47 cbratschi Exp $ */
+/* $Id: win32dlg.cpp,v 1.26 1999-10-31 01:14:42 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -46 +46 @@
 
     dprintf(("********* CREATE DIALOG ************"));
-    xUnit = getXBaseUnit();
-    yUnit = getYBaseUnit();
+    if(fInitialized == FALSE) {
+        if(DIALOG_Init() == FALSE) {
+            dprintf(("DIALOG_Init FAILED!"));
+            DebugInt3();
+            SetLastError(ERROR_GEN_FAILURE);
+            return;
+        }
+        fInitialized = TRUE;
+    }
+    xUnit = xBaseUnit;
+    yUnit = yBaseUnit;
 
     /* Parse dialog template */
@@ -227 +236 @@
     dprintf(("********* DIALOG CREATION FAILED! ************"));
     return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Dialog::MapDialogRect(LPRECT rect)
+{
+    rect->left   = (rect->left * xUnit) / 4;
+    rect->right  = (rect->right * xUnit) / 4;
+    rect->top    = (rect->top * yUnit) / 8;
+    rect->bottom = (rect->bottom * yUnit) / 8;
+    return TRUE;
 }
 /***********************************************************************
@@ -312 +331 @@
 }
 /***********************************************************************
+ *           DIALOG_Init
+ *
+ * Initialisation of the dialog manager.
+ */
+BOOL Win32Dialog::DIALOG_Init(void)
+{
+    HDC hdc;
+    SIZE size;
+
+    /* Calculate the dialog base units */
+    if (!(hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL ))) return FALSE;
+    if (!getCharSizeFromDC( hdc, 0, &size )) return FALSE;
+    DeleteDC( hdc );
+    xBaseUnit = size.cx;
+    yBaseUnit = size.cy;
+
+    return TRUE;
+}
+/***********************************************************************
+ *           DIALOG_GetCharSizeFromDC
+ *
+ *
+ *  Calculates the *true* average size of English characters in the
+ *  specified font as oppposed to the one returned by GetTextMetrics.
+ */
+BOOL Win32Dialog::getCharSizeFromDC( HDC hDC, HFONT hUserFont, SIZE * pSize )
+{
+    BOOL Success = FALSE;
+    HFONT hUserFontPrev = 0;
+    pSize->cx = xBaseUnit;
+    pSize->cy = yBaseUnit;
+
+    if ( hDC )
+    {
+        /* select the font */
+        TEXTMETRICA tm;
+        memset(&tm,0,sizeof(tm));
+        if (hUserFont) hUserFontPrev = SelectFont(hDC,hUserFont);
+        if (GetTextMetricsA(hDC,&tm))
+        {
+            pSize->cx = tm.tmAveCharWidth;
+            pSize->cy = tm.tmHeight;
+
+            /* if variable width font */
+            if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH)
+            {
+                SIZE total;
+                static const char szAvgChars[53] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+                /* Calculate a true average as opposed to the one returned
+                 * by tmAveCharWidth. This works better when dealing with
+                 * proportional spaced fonts and (more important) that's
+                 * how Microsoft's dialog creation code calculates the size
+                 * of the font
+                 */
+                if (GetTextExtentPointA(hDC,szAvgChars,sizeof(szAvgChars),&total))
+                {
+                   /* round up */
+                    pSize->cx = ((2*total.cx/sizeof(szAvgChars)) + 1)/2;
+                    Success = TRUE;
+                }
+            }
+            else
+            {
+                Success = TRUE;
+            }
+        }
+
+        /* select the original font */
+        if (hUserFontPrev) SelectFont(hDC,hUserFontPrev);
+    }
+    return (Success);
+}
+/***********************************************************************
+ *           DIALOG_GetCharSize
+ *
+ *
+ *  Calculates the *true* average size of English characters in the
+ *  specified font as oppposed to the one returned by GetTextMetrics.
+ *  A convenient variant of DIALOG_GetCharSizeFromDC.
+ */
+BOOL Win32Dialog::getCharSize( HFONT hUserFont, SIZE * pSize )
+{
+    HDC  hDC = GetDC(0);
+    BOOL Success = getCharSizeFromDC( hDC, hUserFont, pSize );
+    ReleaseDC(0, hDC);
+    return Success;
+}
+/***********************************************************************
  *           DIALOG_ParseTemplate32
  *
@@ -513 +621 @@
                                         (LPCWSTR)info.className,
                                         (LPCWSTR)info.windowName,
-                                        info.style | WS_CHILD | WS_CLIPSIBLINGS,
+                                        info.style | WS_CHILD,
                                         info.x * xUnit / 4,
                                         info.y * yUnit / 8,
@@ -537 +645 @@
                                         classNameA,
                                         windowNameA,
-                                        info.style | WS_CHILD | WS_CLIPSIBLINGS,
+                                        info.style | WS_CHILD,
                                         info.x * xUnit / 4,
                                         info.y * yUnit / 8,
@@ -978 +1086 @@
 //******************************************************************************
 //******************************************************************************
-
+BOOL Win32Dialog::fInitialized = FALSE;
+int  Win32Dialog::xBaseUnit    = 10;
+int  Win32Dialog::yBaseUnit    = 20;