From cf3310e4e92926137692e3a9d780073be4df325f Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sun, 19 Feb 2017 10:23:26 +0000 Subject: [PATCH] [UXTHEME] -The code to draw the classic style borders was copied from win32k, so imitate what it does and restore two bits that got removed in the copy. CORE-9667 svn path=/trunk/; revision=73834 --- reactos/dll/win32/uxtheme/nonclient.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/uxtheme/nonclient.c b/reactos/dll/win32/uxtheme/nonclient.c index 3374f3b0f5f..c91ed439a91 100644 --- a/reactos/dll/win32/uxtheme/nonclient.c +++ b/reactos/dll/win32/uxtheme/nonclient.c @@ -58,6 +58,7 @@ UserHasWindowEdge(DWORD Style, DWORD ExStyle) return FALSE; if (Style & WS_THICKFRAME) return TRUE; + Style &= WS_CAPTION; if (Style == WS_DLGFRAME || Style == WS_CAPTION) return TRUE; return FALSE; @@ -442,9 +443,9 @@ DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height); @@ -467,9 +468,9 @@ DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height);