Skip to content

W
wine-cw
Commit edbea606 authored by Vitaliy Margolen's avatar Vitaliy Margolen Committed by Alexandre Julliard
Browse files
Options

comctl32: Fix propsheet size calculation.

parent 95d82484
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
dlls/comctl32/propsheet.c
View file @ edbea606
...@@ -740,7 +740,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) ...@@ -740,7 +740,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
HWND hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL); HWND hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
HWND hwndButton = GetDlgItem(hwndDlg, IDOK); HWND hwndButton = GetDlgItem(hwndDlg, IDOK);
RECT rc,tabRect; RECT rc,tabRect;
int tabOffsetX, tabOffsetY, buttonHeight; int buttonHeight;
PADDING_INFO padding = PROPSHEET_GetPaddingInfo(hwndDlg); PADDING_INFO padding = PROPSHEET_GetPaddingInfo(hwndDlg);
RECT units; RECT units;
...@@ -784,9 +784,6 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) ...@@ -784,9 +784,6 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, TRUE, (LPARAM)&rc); SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, TRUE, (LPARAM)&rc);
tabOffsetX = -(rc.left);
tabOffsetY = -(rc.top);
rc.right -= rc.left; rc.right -= rc.left;
rc.bottom -= rc.top; rc.bottom -= rc.top;
TRACE("setting tab %p, rc (0,0)-(%d,%d)\n", TRACE("setting tab %p, rc (0,0)-(%d,%d)\n",
...@@ -798,8 +795,14 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) ...@@ -798,8 +795,14 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
TRACE("tab client rc %s\n", wine_dbgstr_rect(&rc)); TRACE("tab client rc %s\n", wine_dbgstr_rect(&rc));
rc.right += ((padding.x * 2) + tabOffsetX); rc.right += (padding.x * 2);
rc.bottom += (buttonHeight + (3 * padding.y) + tabOffsetY); rc.bottom += buttonHeight + (3 * padding.y);
if (!psInfo->isModeless)
AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE);
rc.right -= rc.left;
rc.bottom -= rc.top;
/* /*
* Resize the property sheet. * Resize the property sheet.
......
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