mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
Fix displaying the window caption height (SM_CYCAPTION includes SM_CYBORDER)
svn path=/trunk/; revision=29299
This commit is contained in:
parent
69f3c70b62
commit
e809e77341
|
@ -27,6 +27,7 @@ typedef struct _PREVIEW_DATA
|
||||||
INT cySizeFrame;
|
INT cySizeFrame;
|
||||||
|
|
||||||
INT cyCaption;
|
INT cyCaption;
|
||||||
|
INT cyBorder;
|
||||||
INT cyMenu;
|
INT cyMenu;
|
||||||
INT cxScrollbar;
|
INT cxScrollbar;
|
||||||
|
|
||||||
|
@ -159,6 +160,7 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData)
|
||||||
pPreviewData->cyCaption = GetSystemMetrics(SM_CYCAPTION);
|
pPreviewData->cyCaption = GetSystemMetrics(SM_CYCAPTION);
|
||||||
pPreviewData->cyMenu = GetSystemMetrics(SM_CYMENU);
|
pPreviewData->cyMenu = GetSystemMetrics(SM_CYMENU);
|
||||||
pPreviewData->cxScrollbar = GetSystemMetrics(SM_CXVSCROLL);
|
pPreviewData->cxScrollbar = GetSystemMetrics(SM_CXVSCROLL);
|
||||||
|
pPreviewData->cyBorder = GetSystemMetrics(SM_CYBORDER);
|
||||||
|
|
||||||
/* load font info */
|
/* load font info */
|
||||||
NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
|
NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
|
||||||
|
@ -207,7 +209,7 @@ CalculateItemSize(PPREVIEW_DATA pPreviewData)
|
||||||
pPreviewData->rcInactiveCaption.left = pPreviewData->rcInactiveFrame.left + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
pPreviewData->rcInactiveCaption.left = pPreviewData->rcInactiveFrame.left + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
||||||
pPreviewData->rcInactiveCaption.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + pPreviewData->cySizeFrame + 1;
|
pPreviewData->rcInactiveCaption.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + pPreviewData->cySizeFrame + 1;
|
||||||
pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - pPreviewData->cySizeFrame - 1;
|
pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - pPreviewData->cySizeFrame - 1;
|
||||||
pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveCaption.top + pPreviewData->cyCaption;
|
pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveCaption.top + pPreviewData->cyCaption - pPreviewData->cyBorder;
|
||||||
|
|
||||||
/* Calculate the inactive caption buttons rectangle */
|
/* Calculate the inactive caption buttons rectangle */
|
||||||
pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16;
|
pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16;
|
||||||
|
@ -225,7 +227,7 @@ CalculateItemSize(PPREVIEW_DATA pPreviewData)
|
||||||
pPreviewData->rcActiveCaption.left = pPreviewData->rcActiveFrame.left + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
pPreviewData->rcActiveCaption.left = pPreviewData->rcActiveFrame.left + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
||||||
pPreviewData->rcActiveCaption.top = pPreviewData->rcActiveFrame.top + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
pPreviewData->rcActiveCaption.top = pPreviewData->rcActiveFrame.top + pPreviewData->cxEdge + pPreviewData->cySizeFrame + 1;
|
||||||
pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - pPreviewData->cxEdge - pPreviewData->cySizeFrame - 1;
|
pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - pPreviewData->cxEdge - pPreviewData->cySizeFrame - 1;
|
||||||
pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveCaption.top + pPreviewData->cyCaption;
|
pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveCaption.top + pPreviewData->cyCaption - pPreviewData->cyBorder;
|
||||||
|
|
||||||
/* Calculate the active caption buttons rectangle */
|
/* Calculate the active caption buttons rectangle */
|
||||||
pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16;
|
pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16;
|
||||||
|
|
Loading…
Reference in a new issue