Changeset 7541 for trunk/src/comctl32/propsheet.cpp

Timestamp:

Dec 4, 2001, 12:26:26 PM (24 years ago)

Author:

sandervl

Message:

Hack added for proper resizing of wizard property sheet

File:

• trunk/src/comctl32/propsheet.cpp (modified) (31 diffs)

trunk/src/comctl32/propsheet.cpp

@@ -1 @@
-/* $Id: propsheet.cpp,v 1.11 2001-12-02 12:39:49 sandervl Exp $ */
+/* $Id: propsheet.cpp,v 1.12 2001-12-04 11:26:26 sandervl Exp $ */
 /*
  * Property Sheets
@@ -27 +27 @@
 #include "comctl32.h"
 #include "heapstring.h"
+#include <debugtools.h>
 
 /******************************************************************************
@@ -168 +169 @@
   if (dwFlags & PSH_USEPSTARTPAGE)
   {
-    //TRACE(propsheet, "PSH_USEPSTARTPAGE is on");
+    TRACE("PSH_USEPSTARTPAGE is on");
     psInfo->active_page = 0;
   }
@@ -318 +319 @@
   /* Extract the caption */
   psInfo->proppage[index].pszText = (LPCWSTR)p;
-  //TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
+  TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
   p += lstrlenW((LPCWSTR)p) + 1;
 
@@ -481 +482 @@
    */
   GetClientRect(hwndTabCtrl, &rcOrigTab);
-//  TRACE(propsheet, "orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
-//        rcOrigTab.right, rcOrigTab.bottom);
+  TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
+        rcOrigTab.right, rcOrigTab.bottom);
 
   /*
@@ -493 +494 @@
 
   MapDialogRect(hwndDlg, &rcPage);
-//  TRACE(propsheet, "biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
-//        rcPage.right, rcPage.bottom);
+  TRACE("biggest page %d %d %d %d (old %,%d)\n", rcPage.left, rcPage.top,
+        rcPage.right, rcPage.bottom, rcOrigTab.right, rcOrigTab.bottom);
 
   if (rcPage.right > rcOrigTab.right)
@@ -520 +521 @@
    */
   GetClientRect(hwndTabCtrl, &rcOrigTab);
-  //TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
-  //      rcOrigTab.right, rcOrigTab.bottom);
+  TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
+        rcOrigTab.right, rcOrigTab.bottom);
 
   /*
@@ -532 +533 @@
 
   MapDialogRect(hwndDlg, &rcPage);
-  //TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
-  //      rcPage.right, rcPage.bottom);
+  TRACE("biggest page %d %d %d %d (old %d,%d %d,%d,)\n", rcPage.left, rcPage.top,
+        rcPage.right, rcPage.bottom, rcOrigTab.left, rcOrigTab.top, rcOrigTab.right, rcOrigTab.bottom);
 
   if ( (rcPage.right - rcPage.left) != (rcOrigTab.right - rcOrigTab.left) )
@@ -574 +575 @@
 
   MapDialogRect(hwndDlg, &rcPage);
-//  TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
-//        rcPage.right, rcPage.bottom);
+  TRACE("biggest page %d %d %d %d (old %d,%d)\n", rcPage.left, rcPage.top,
+        rcPage.right, rcPage.bottom, rcSheetClient.right, rcSheetClient.bottom);
 
   if (rcPage.right > rcSheetClient.right)
@@ -628 +629 @@
   GetClientRect(hwndTabCtrl, &rc);
 
-//  TRACE(propsheet, "tab client rc %d %d %d %d\n",
-//        rc.left, rc.top, rc.right, rc.bottom);
+  TRACE("tab client rc %d %d %d %d\n",
+        rc.left, rc.top, rc.right, rc.bottom);
 
   rc.right += ((padding.x * 2) + tabOffsetX);
@@ -642 +643 @@
   return TRUE;
 }
-
 /******************************************************************************
  *            PROPSHEET_AdjustSizeWizard
@@ -656 +656 @@
   PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg,psInfo);
 
+  dprintf(("PROPSHEET_AdjustSizeWizard %x", hwndDlg));
+
   /* Get the height of buttons */
   GetClientRect(hwndButton, &rc);
@@ -673 +675 @@
   MapDialogRect(hwndDlg, &rc);
 
-//  TRACE("Biggest page %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom);
+  TRACE("Biggest page %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom);
 
   /* Make room */
@@ -685 +687 @@
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 
+  dprintf(("PROPSHEET_AdjustSizeWizard %x DONE", hwndDlg));
   return TRUE;
 }
+
 
 /******************************************************************************
@@ -918 +922 @@
  *
  * Returns the layout information.
- * Horizontal spacing is the distance between the Cancel and Help buttons.
  * Vertical spacing is the distance between the line and the buttons.
- */
-static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg,PropSheetInfo* psInfo)
+ * Do NOT use the Help button to gather padding information when it isn't mapped
+ * (PSH_HASHELP), as app writers aren't forced to supply correct coordinates
+ * for it in this case !
+ * FIXME: I'm not sure about any other coordinate problems with these evil
+ * buttons. Fix it in case additional problems appear or maybe calculate
+ * a padding in a completely different way, as this is somewhat messy.
+ */
+static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, PropSheetInfo* psInfo)
 {
   PADDING_INFO padding;
   RECT rc;
   HWND hwndControl;
-  POINT ptHelp, ptCancel, ptLine;
-
-  /* Help button */
-  hwndControl = GetDlgItem(hwndDlg, IDHELP);
+  INT idButton;
+  POINT ptButton, ptLine;
+
+  TRACE("\n");
+  if (psInfo->hasHelp)
+  {
+        idButton = IDHELP;
+  }
+  else
+  {
+    if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    {
+        idButton = IDC_NEXT_BUTTON;
+    }
+    else
+    {
+        /* hopefully this is ok */
+        idButton = IDCANCEL;
+    }
+  }
+  
+  hwndControl = GetDlgItem(hwndDlg, idButton);
   GetWindowRect(hwndControl, &rc);
 
-  ptHelp.x = rc.left;
-  ptHelp.y = rc.top;
-
-  ScreenToClient(hwndDlg, &ptHelp);
-
-  /* Cancel button */
-  hwndControl = GetDlgItem(hwndDlg, IDCANCEL);
-  GetWindowRect(hwndControl, &rc);
-
-  ptCancel.x = rc.right;
-  ptCancel.y = rc.top;
-
-  ScreenToClient(hwndDlg, &ptCancel);
+  ptButton.x = rc.left;
+  ptButton.y = rc.top;
+
+  ScreenToClient(hwndDlg, &ptButton);
 
   /* Line */
@@ -955 +973 @@
   ScreenToClient(hwndDlg, &ptLine);
 
-  padding.x = ptHelp.x - ptCancel.x;
-  padding.y = ptHelp.y - ptLine.y;
-
-//CB: BUG: psInfo->hasHelp not checked -> negative values
-//    add better wizard handling, fix button placement bugs FIXME
-//
-//    workaround for now:
-if (padding.x < 0) padding.x = 0;
-if (padding.y < 0) padding.y = 0;
+  padding.y = ptButton.y - ptLine.y;
+
+  if (padding.y < 0)
+          ERR("padding negative ! Please report this !\n");
+
+  /* this is most probably not correct, but the best we have now */
+  padding.x = padding.y;
 
   return padding;
@@ -1030 +1046 @@
   DLGTEMPLATE* pTemplate;
   HWND hwndPage;
-
+  RECT rc;
   PropPageInfo* ppInfo = psInfo->proppage;
-
-  //TRACE("index %d\n", index);
-
+  PADDING_INFO padding;
+  UINT pageWidth,pageHeight;
+  DWORD resSize;
+  LPVOID temp = NULL;
+
+  TRACE("index %d\n", index);
+
+#ifdef __WIN32OS2__
   //AH: Check if ppshpage is valid
   if (ppshpage == NULL)
@@ -1041 +1062 @@
     return FALSE;
   }
+#endif
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
@@ -1046 +1068 @@
   else
   {
-    HRSRC hResource = FindResourceA(ppshpage->hInstance,
+    HRSRC hResource;
+    HANDLE hTemplate;
+
+    hResource = FindResourceA(ppshpage->hInstance,
                                     ppshpage->pszTemplate,
                                     RT_DIALOGA);
-    HGLOBAL hTemplate = LoadResource(ppshpage->hInstance, hResource);
+    if(!hResource)
+        return FALSE;
+
+    resSize = SizeofResource(ppshpage->hInstance, hResource);
+
+    hTemplate = LoadResource(ppshpage->hInstance, hResource);
+    if(!hTemplate)
+        return FALSE;
+
     pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
-  }
-
-  //AH: Check if pTemplate is valid
-  if (pTemplate == NULL)
-  {
-    dprintf(("COMCTL32:PROPSHEET_CreatePage: ERROR!!! Dialog Template == NULL!!!\n"));
-    return FALSE;
-  }
-
- if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
+    /*
+     * Make a copy of the dialog template to make it writable
+     */
+    temp = COMCTL32_Alloc(resSize);
+    if (!temp)
+      return FALSE;
+
+    memcpy(temp, pTemplate, resSize);
+    pTemplate = (DLGTEMPLATE*)temp;
+  }
+
+  if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
   {
     ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD | DS_CONTROL;
@@ -1069 +1104 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE;
+#ifdef __WIN32OS2__
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_THICKFRAME;
+#endif
   }
   else
   {
-    pTemplate->style |= WS_CHILDWINDOW | DS_CONTROL;
+    pTemplate->style |= WS_CHILD | DS_CONTROL;
     pTemplate->style &= ~DS_MODALFRAME;
     pTemplate->style &= ~WS_CAPTION;
@@ -1080 +1117 @@
     pTemplate->style &= ~WS_DISABLED;
     pTemplate->style &= ~WS_VISIBLE;
+#ifdef __WIN32OS2__
     pTemplate->style &= ~WS_THICKFRAME;
+#endif
   }
 
@@ -1089 +1128 @@
 
   hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance,
-                                        pTemplate,
-                                        hwndParent,
-                                        ppshpage->pfnDlgProc,
-                                        (LPARAM)ppshpage);
+                                        pTemplate,
+                                        hwndParent,
+                                        ppshpage->pfnDlgProc,
+                                        (LPARAM)ppshpage);
+  /* Free a no more needed copy */
+  if(temp)
+      COMCTL32_Free(temp);
 
   ppInfo[index].hwndPage = hwndPage;
+
+  rc.left = psInfo->x;
+  rc.top = psInfo->y;
+  rc.right = psInfo->width;
+  rc.bottom = psInfo->height;
+
+  MapDialogRect(hwndParent, &rc);
+
+  pageWidth = rc.right - rc.left;
+  pageHeight = rc.bottom - rc.top;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, (PropSheetInfo* )psInfo);
+  else
+  {
+    /*
+     * Ask the Tab control to fit this page in.
+     */
+
+    HWND hwndTabCtrl = GetDlgItem(hwndParent, IDC_TABCONTROL);
+    SendMessageA(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
+    padding = PROPSHEET_GetPaddingInfo(hwndParent);
+  }
+
+#ifdef __WIN32OS2__
+  //HACK alert!
+  //SvL: CVP multiplies y padding by two to calculate the new height
+  //I have no idea if this is always correct
+  SetWindowPos(hwndPage, HWND_TOP,
+               rc.left + padding.x/2,
+               rc.top + padding.y/2,
+               pageWidth, pageHeight, 0);
+#else
+  SetWindowPos(hwndPage, HWND_TOP,
+               rc.left + padding.x,
+               rc.top + padding.y,
+               pageWidth, pageHeight, 0);
+#endif
 
   return TRUE;
@@ -1168 +1248 @@
   }
 
+#if 1
+  ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
+
+  /* Synchronize current selection with tab control
+   * It seems to be needed even in case of PSH_WIZARD (no tab controls there) */
+  HWND hwndTabCtrl;
+  hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+  SendMessageA(hwndTabCtrl, TCM_SETCURSEL, index, 0);
+
+  psInfo->active_page = index;
+  psInfo->activeValid = TRUE;
+#else
   /* HACK: Sometimes a property page doesn't get displayed at the right place inside the
    *       property sheet. This will force the window to be placed at the proper location
@@ -1208 +1300 @@
   psInfo->active_page = index;
   psInfo->activeValid = TRUE;
-
+#endif
   return 1;
 }
@@ -1274 +1366 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 
-  //TRACE("msg result %ld\n", msgResult);
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult == -1)
@@ -1313 +1405 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 
-  //TRACE("msg result %ld\n", msgResult);
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult != 0)
@@ -1629 +1721 @@
   if (index < 0 || index >= psInfo->nPages)
   {
-    //TRACE("Could not find page to select!\n");
+    TRACE("Could not find page to select!\n");
     return FALSE;
   }
 
+  if (!psInfo->proppage[index].hwndPage) {
+      LPPROPSHEETPAGEA ppshpage = (LPPROPSHEETPAGEA)psInfo->proppage[index].hpage;
+      PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage);
+  }
   hwndPage = psInfo->proppage[index].hwndPage;
 
@@ -1639 +1735 @@
    * If not it will get created and notified in PROPSHEET_ShowPage.
    */
+
   if (hwndPage)
   {
@@ -1851 +1948 @@
   if (index < 0 || index >= psInfo->nPages)
   {
-      //TRACE("Could not find page to remove!\n");
+      TRACE("Could not find page to remove!\n");
       return FALSE;
   }
 
-  //TRACE("total pages %d removing page %d active page %d\n",
-  //      psInfo->nPages, index, psInfo->active_page);
+  TRACE("total pages %d removing page %d active page %d\n",
+        psInfo->nPages, index, psInfo->active_page);
   /*
    * Check if we're removing the active page.
@@ -1935 +2032 @@
   HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
 
-  //TRACE("%ld\n", dwFlags);
+  TRACE("%ld\n", dwFlags);
 
   EnableWindow(hwndBack, FALSE);
@@ -2007 +2104 @@
                                                        PropSheetInfoStr);
 
-  //TRACE("\n");
+  TRACE("\n");
   if (HIWORD(psInfo->ppshheader->pszCaption))
       HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->ppshheader->pszCaption);