Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32] Fix Property Sheet initial position (#5631)

Browse source 
On WM_INITDIALOG handling of the property
sheet dialog procedure, move the dialog if
necessary. CORE-19141
This commit is contained in:
Katayama Hirofumi MZ 2023-08-31 09:32:52 +09:00 committed by GitHub
parent c16f93c5f3
commit 28e771713f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
dll/win32/comctl32/propsheet.c
View file

@ -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;
/* Move the window position if necessary */
{
INT dx, dy;
RECT rcInit;
HWND hwndParent = psInfo->ppshheader.hwndParent;
BOOL bMove = FALSE;
if (GetWindowRect(hwnd, &rcDlg) && SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWork, 0))
GetWindowRect(hwnd, &rcInit);
dx = rcInit.right - rcInit.left;
dy = rcInit.bottom - rcInit.top;
if (IsWindow(hwndParent))
{
dx = rcDlg.right - rcWork.right;
dy = rcDlg.bottom - rcWork.bottom;
WINDOWPLACEMENT wndpl = { sizeof(wndpl) };
bMove = TRUE;
if (rcDlg.right > rcWork.right)
rcDlg.left -= dx;
if (rcDlg.bottom > rcWork.bottom)
rcDlg.top -= dy;
/* 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);
SetWindowPos(hwnd, HWND_TOPMOST, rcDlg.left, rcDlg.top, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSIZE);
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);
}
}
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