From 3b1abd64d6576a57d18615b4a394c8302262407d Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 20 Dec 2014 16:49:31 +0000 Subject: [PATCH] [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We don't have a proper solution for these differences in behavior and since we already opt to use the v6 behavior I think it is fine. CORE-5483 #resolve #comment Committed a slightly different version of the patch, thanks. svn path=/trunk/; revision=65766 --- reactos/dll/win32/comctl32/toolbar.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c index fe8846ef26f..6923caa311a 100644 --- a/reactos/dll/win32/comctl32/toolbar.c +++ b/reactos/dll/win32/comctl32/toolbar.c @@ -244,7 +244,12 @@ static void TOOLBAR_TooltipSetRect(const TOOLBAR_INFO *infoPtr, const TBUTTON_IN static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { +#if 0 return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +#else + /* This is the behaviour in comctl32 v6 */ + return 0; +#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)