Changeset 5969 for trunk/src/user32/oslibwin.cpp

Timestamp:

Jun 12, 2001, 10:02:35 AM (24 years ago)

Author:

sandervl

Message:

PM frame control positioning fixes

File:

• trunk/src/user32/oslibwin.cpp (modified) (5 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.97 2001-06-10 12:05:38 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.98 2001-06-12 08:02:35 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -141 +141 @@
   HWND hwndControl;
   int  i = 0;
-  static int minmaxwidth = 0;
+  static int minmaxwidth  = 0;
+  static int minmaxheight = 0;
 
   if(minmaxwidth == 0) {
-      minmaxwidth = WinQuerySysValue(HWND_DESKTOP, SV_CXMINMAXBUTTON);
+      minmaxwidth  = WinQuerySysValue(HWND_DESKTOP, SV_CXMINMAXBUTTON);
+      minmaxheight = WinQuerySysValue(HWND_DESKTOP, SV_CYMINMAXBUTTON);
   }
 
@@ -153 +155 @@
       swp[i].x  = pRect->xLeft;
       swp[i].y  = pRect->yBottom;
+      if(pRect->yTop - pRect->yBottom > minmaxheight) {
+          swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+      }
       swp[i].cx = minmaxwidth/2;
-      swp[i].cy = pRect->yTop - pRect->yBottom;
+      swp[i].cy = minmaxheight;;
       swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
-      pRect->xLeft += swp[i].cx;
+      dprintf(("FID_SYSMENU (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
+      pRect->xLeft += minmaxwidth/2;
       i++;
   }
@@ -167 +173 @@
       swp[i].cx = pRect->xRight - pRect->xLeft;
       if(WinWindowFromID(hwndFrame, FID_MINMAX)) {
-          swp[i].cx -= minmaxwidth - minmaxwidth/2;
+          swp[i].cx -= (minmaxwidth + minmaxwidth/2);
       }
       swp[i].cy = pRect->yTop - pRect->yBottom;
       swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+      dprintf(("FID_TITLEBAR (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
       pRect->xLeft += swp[i].cx;
       i++;
@@ -180 +187 @@
       swp[i].x  = pRect->xLeft;
       swp[i].y  = pRect->yBottom;
+      if(pRect->yTop - pRect->yBottom > minmaxheight) {
+          swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+      }
       swp[i].cx = minmaxwidth + minmaxwidth/2;
-      swp[i].cy = pRect->yTop - pRect->yBottom;
+      swp[i].cy = minmaxheight;
       swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+      dprintf(("FID_MINMAX (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
       pRect->xLeft += swp[i].cx;
       i++;