Rein Klazes : comdlg32: Fix a problem with resizing a customized file dialog.
Alexandre Julliard
julliard at winehq.org
Thu Jul 9 10:56:58 CDT 2009
Module: wine
Branch: master
Commit: a73175fd11f398184deb316bde1daac9ec682e5c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73175fd11f398184deb316bde1daac9ec682e5c
Author: Rein Klazes <wijn at online.nl>
Date: Thu Jul 9 09:36:04 2009 +0200
comdlg32: Fix a problem with resizing a customized file dialog.
---
dlls/comdlg32/filedlg.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index eb92c0d..faed51a 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -1117,9 +1117,6 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
if(fodInfos->DlgInfos.hwndCustomDlg &&
(fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)))
{
- GetClientRect(hwnd, &rc);
- DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL,
- 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD);
ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT))
{
@@ -1142,6 +1139,11 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER);
}
}
+ /* size the custom dialog at the end: some applications do some
+ * control re-arranging at this point */
+ GetClientRect(hwnd, &rc);
+ DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL,
+ 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
}
EndDeferWindowPos( hdwp);
/* should not be needed */
More information about the wine-cvs
mailing list