Skip to content

W
wine-winehq
Commit 0f36ec47 authored by Hidenori Takeshima's avatar Hidenori Takeshima Committed by Alexandre Julliard
Browse files
Options

ArrangeCtrlPositions: fix for user-defined template with no stc32.

parent 33026a2a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/commdlg/filedlg95.c
View file @ 0f36ec47
...@@ -491,7 +491,8 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg) ...@@ -491,7 +491,8 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
{ {
if( (GetWindow(hwndChildDlg,GW_CHILD)) == (HWND) NULL) if( (GetWindow(hwndChildDlg,GW_CHILD)) == (HWND) NULL)
return; return;
ptParentClient.x = rectParent.right-rectParent.left; SetRectEmpty(&rectTemp);
ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.left));
ptParentClient.y = (rectParent.bottom-rectParent.top) + (rectChild.bottom-rectChild.top); ptParentClient.y = (rectParent.bottom-rectParent.top) + (rectChild.bottom-rectChild.top);
ptMoveCtl.y = rectParent.bottom-rectParent.top; ptMoveCtl.y = rectParent.bottom-rectParent.top;
ptMoveCtl.x=0; ptMoveCtl.x=0;
...@@ -528,14 +529,14 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg) ...@@ -528,14 +529,14 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
Check the initial position of the controls relative to the initial Check the initial position of the controls relative to the initial
position and size of stc32 (before it is expanded). position and size of stc32 (before it is expanded).
*/ */
if (rectCtrl.left > rectTemp.right && rectCtrl.top > rectTemp.bottom) if (rectCtrl.left >= rectTemp.right && rectCtrl.top >= rectTemp.bottom)
{ {
rectCtrl.left += ptMoveCtl.x; rectCtrl.left += ptMoveCtl.x;
rectCtrl.top += ptMoveCtl.y; rectCtrl.top += ptMoveCtl.y;
} }
else if (rectCtrl.left > rectTemp.right) else if (rectCtrl.left >= rectTemp.right)
rectCtrl.left += ptMoveCtl.x; rectCtrl.left += ptMoveCtl.x;
else if (rectCtrl.top > rectTemp.bottom) else if (rectCtrl.top >= rectTemp.bottom)
rectCtrl.top += ptMoveCtl.y; rectCtrl.top += ptMoveCtl.y;
SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment