From e809e7734182bba0f4a22a5d6c84cac2d1a7a0bc Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 29 Sep 2007 18:28:45 +0000
Subject: [PATCH] Fix displaying the window caption height (SM_CYCAPTION
 includes SM_CYBORDER)

svn path=/trunk/; revision=29299
---
 reactos/dll/cpl/desk/preview.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/cpl/desk/preview.c b/reactos/dll/cpl/desk/preview.c
index 05a78413d47..bee6ac10f2c 100644
--- a/reactos/dll/cpl/desk/preview.c
+++ b/reactos/dll/cpl/desk/preview.c
@@ -27,6 +27,7 @@ typedef struct _PREVIEW_DATA
     INT cySizeFrame;
 
     INT cyCaption;
+    INT cyBorder;
     INT cyMenu;
     INT cxScrollbar;
 
@@ -159,6 +160,7 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData)
     pPreviewData->cyCaption = GetSystemMetrics(SM_CYCAPTION);
     pPreviewData->cyMenu = GetSystemMetrics(SM_CYMENU);
     pPreviewData->cxScrollbar = GetSystemMetrics(SM_CXVSCROLL);
+    pPreviewData->cyBorder = GetSystemMetrics(SM_CYBORDER);
 
     /* load font info */
     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.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + 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 */
     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.top = pPreviewData->rcActiveFrame.top + 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 */
     pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16;