[ros-diffs] [cfinck] 33985: 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

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sun Jun 15 11:05:39 2008
New Revision: 33985

URL: http://svn.reactos.org/svn/reactos?rev=33985&view=rev
Log:
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

Modified:
    trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
    trunk/reactos/dll/win32/comctl32/treeview.c

Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=33985&r1=33984&r2=33985&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Sun Jun 15 11:05:39 2008
@@ -123,8 +123,8 @@
  
 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 @@
      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 {

Modified: trunk/reactos/dll/win32/comctl32/treeview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=33985&r1=33984&r2=33985&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Jun 15 11:05:39 2008
@@ -3207,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 {