https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28e771713f7eb533b275c2f3fa8bfd52edb52739
commit 28e771713f7eb533b275c2f3fa8bfd52edb52739 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Thu Aug 31 09:32:52 2023 +0900 Commit: GitHub <[email protected]> CommitDate: Thu Aug 31 09:32:52 2023 +0900 [COMCTL32] Fix Property Sheet initial position (#5631) On WM_INITDIALOG handling of the property sheet dialog procedure, move the dialog if necessary. CORE-19141 --- dll/win32/comctl32/propsheet.c | 80 ++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index 543372fbb7f..e58fd467a3d 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -3581,26 +3581,70 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SetFocus(GetDlgItem(hwnd, IDOK)); } #ifdef __REACTOS__ - { /* - try to fit it into the desktop - user32 positions the dialog based on the IDD_PROPSHEET template, - but we've since made it larger by adding controls - */ - RECT rcWork; - RECT rcDlg; - int dx, dy; - - if (GetWindowRect(hwnd, &rcDlg) && SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWork, 0)) - { - dx = rcDlg.right - rcWork.right; - dy = rcDlg.bottom - rcWork.bottom; + /* Move the window position if necessary */ + { + INT dx, dy; + RECT rcInit; + HWND hwndParent = psInfo->ppshheader.hwndParent; + BOOL bMove = FALSE; - if (rcDlg.right > rcWork.right) - rcDlg.left -= dx; - if (rcDlg.bottom > rcWork.bottom) - rcDlg.top -= dy; + GetWindowRect(hwnd, &rcInit); + dx = rcInit.right - rcInit.left; + dy = rcInit.bottom - rcInit.top; + + if (IsWindow(hwndParent)) + { + WINDOWPLACEMENT wndpl = { sizeof(wndpl) }; + bMove = TRUE; + + /* hwndParent can be minimized (See Control_ShowAppletInTaskbar). + Use normal position. */ + GetWindowPlacement(hwndParent, &wndpl); + rcInit = wndpl.rcNormalPosition; + if (IsWindowVisible(hwndParent) && !IsIconic(hwndParent)) + { + /* Is it Right-to-Left layout? */ + if (GetWindowLongPtrW(hwndParent, GWL_EXSTYLE) & WS_EX_RTLREADING) + rcInit.left = rcInit.right - dx - GetSystemMetrics(SM_CXSMICON); + else + rcInit.left += GetSystemMetrics(SM_CXSMICON); + + rcInit.top += GetSystemMetrics(SM_CYSMICON); + } + } + else + { + /* We cannot foresee CW_USEDEFAULT's position without communicating with USER32. + Use a top-level STATIC control to get the proper position. */ + HWND hwndDummy = CreateWindowExW(0, WC_STATICW, NULL, 0, + CW_USEDEFAULT, CW_USEDEFAULT, dx, dy, + NULL, NULL, GetModuleHandleW(NULL), NULL); + if (hwndDummy) + { + bMove = TRUE; + GetWindowRect(hwndDummy, &rcInit); + DestroyWindow(hwndDummy); + } + } - SetWindowPos(hwnd, HWND_TOPMOST, rcDlg.left, rcDlg.top, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSIZE); + if (bMove) + { + MONITORINFO mi = { sizeof(mi) }; + HMONITOR hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + if (GetMonitorInfo(hMonitor, &mi)) + { + /* Try to fit it onto the desktop */ + if (mi.rcWork.right < rcInit.left + dx) + rcInit.left = mi.rcWork.right - dx; + if (mi.rcWork.bottom < rcInit.top + dy) + rcInit.top = mi.rcWork.bottom - dy; + if (rcInit.left < mi.rcWork.left) + rcInit.left = mi.rcWork.left; + if (rcInit.top < mi.rcWork.top) + rcInit.top = mi.rcWork.top; + SetWindowPos(hwnd, NULL, rcInit.left, rcInit.top, 0, 0, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } } } #endif
