From abae3b6913ada787944f794ed5be8c0ae6ceb607 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sun, 15 Jun 2008 16:05:39 +0000 Subject: [PATCH] Use a ClipRegion when collapsing, so that the TreeView works correctly. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accordingly. Patch by Timo Kreuzer svn path=/trunk/; revision=33985 --- reactos/dll/win32/comctl32/comctl32_ros.diff | 13 +++++++++++-- reactos/dll/win32/comctl32/treeview.c | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/comctl32/comctl32_ros.diff b/reactos/dll/win32/comctl32/comctl32_ros.diff index 2adfdd721ea..c25767a938a 100644 --- a/reactos/dll/win32/comctl32/comctl32_ros.diff +++ b/reactos/dll/win32/comctl32/comctl32_ros.diff @@ -123,8 +123,8 @@ Index: tooltips.c Index: treeview.c =================================================================== ---- treeview.c (revision 27134) -+++ treeview.c (working copy) +--- D:/Wine-CVS/wine/dlls/comctl32/treeview.c Sun Jun 15 18:29:21 2008 ++++ D:/ReactOS-Trunk/reactos/dll/win32/comctl32/treeview.c Sun Jun 15 18:27:14 2008 @@ -2826,8 +2826,6 @@ } } @@ -134,3 +134,12 @@ Index: treeview.c if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); +@@ -3209,7 +3207,7 @@ + { + scrollRect.top = nextItem->rect.top; + +- ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, ++ ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, &scrollRect, + NULL, NULL, SW_ERASE | SW_INVALIDATE); + TREEVIEW_Invalidate(infoPtr, wineItem); + } else { diff --git a/reactos/dll/win32/comctl32/treeview.c b/reactos/dll/win32/comctl32/treeview.c index 84b23f5d252..e242880f199 100644 --- a/reactos/dll/win32/comctl32/treeview.c +++ b/reactos/dll/win32/comctl32/treeview.c @@ -3207,7 +3207,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, { scrollRect.top = nextItem->rect.top; - ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, + ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, &scrollRect, NULL, NULL, SW_ERASE | SW_INVALIDATE); TREEVIEW_Invalidate(infoPtr, wineItem); } else { -- 2.17.1