Changeset 153 for trunk/src/helpers/winh.c

Timestamp:

Apr 14, 2002, 1:42:05 AM (23 years ago)

Author:

umoeller

Message:

Lots of changes from the last three weeks.

File:

• trunk/src/helpers/winh.c (modified) (5 diffs)

trunk/src/helpers/winh.c

@@ -60 +60 @@
 #define INCL_WINSTATICS
 #define INCL_WINMENUS
+#define INCL_WINENTRYFIELDS
 #define INCL_WINSCROLLBARS
 #define INCL_WINLISTBOXES
@@ -2352 +2353 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V0.9.19 (2001-04-13) [umoeller]: added correlation for entry field repositioning, this was always off
  */
 
@@ -2372 +2374 @@
         LONG    ldcx, ldcy;
         ULONG   cWindows = 0;
+
+        // V0.9.19 (2001-04-13) [umoeller]
+        LONG cxMarginEF = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CXBORDER);
+        LONG cyMarginEF = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CYBORDER);
 
         // setup mode:
@@ -2391 +2397 @@
             {
                 HWND hwndThis;
+                CHAR szClass[10];
                 if (hwndThis = WinWindowFromID(hwndDlg, SHORT1FROMMP(*pmpThis)))
                 {
                     WinQueryWindowPos(hwndThis, pswpThis);
+
+                    // correlate the stupid repositioning of entry fields
+                    // V0.9.19 (2001-04-13) [umoeller]
+                    if (    (WinQueryClassName(hwndThis, sizeof(szClass), szClass)
+                         && (!strcmp(szClass, "#6"))
+                         && (WinQueryWindowULong(hwndThis, QWL_STYLE) & ES_MARGIN))
+                       )
+                    {
+                        pswpThis->x += cxMarginEF;
+                        pswpThis->y += cyMarginEF;
+                        pswpThis->cx -= 2 * cxMarginEF;
+                        pswpThis->cy -= 2 * cyMarginEF;
+                    }
+
                     cWindows++;
                 }
@@ -2422 +2443 @@
                  ul++)
             {
-                HWND hwndThis = WinWindowFromID(hwndDlg, SHORT1FROMMP(*pmpThis));
-                if (hwndThis)
+                HWND hwndThis;
+                if (hwndThis = WinWindowFromID(hwndDlg, SHORT1FROMMP(*pmpThis)))
                 {
                     LONG    x = pswpThis->x,