commit 4a8e33954eeddf090774da01bb80f9f852cfefc4
author Huw Davies <huw@codeweavers.com> Fri Nov 21 21:30:20 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Nov 21 21:30:20 2003 +0000
tree d9917f5cb9b17b7679a93f3d459986c045743170
parent 8a7fbf542dbc9a003f3b9ef9d0a13708607af4f1

We need to send TVN_EXPAND* on collapsing either when the user has
initiated it with the mouse/keybaord or in response to a TVM_EXPAND
when the state is not TVIS_EXPANDEDONCE.  This brings the logic into
line with TREEVIEW_Expand.

dlls/comctl32/treeview.c

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 2a025eb..833bfe8 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3134,7 +3134,7 @@
     if (!(wineItem->state & TVIS_EXPANDED))
 	return FALSE;
 
-    if (bUser)
+    if (bUser || !(wineItem->state & TVIS_EXPANDEDONCE))
 	TREEVIEW_SendExpanding(infoPtr, wineItem, action);
 
     if (wineItem->firstChild == NULL)
@@ -3142,7 +3142,7 @@
 
     wineItem->state &= ~TVIS_EXPANDED;
 
-    if (bUser)
+    if (bUser || !(wineItem->state & TVIS_EXPANDEDONCE))
 	TREEVIEW_SendExpanded(infoPtr, wineItem, action);
 
     bSetSelection = (infoPtr->selectedItem != NULL
@@ -3153,9 +3153,11 @@
 
     if (bRemoveChildren)
     {
+        INT old_cChildren = wineItem->cChildren;
 	TRACE("TVE_COLLAPSERESET\n");
 	wineItem->state &= ~TVIS_EXPANDEDONCE;
 	TREEVIEW_RemoveAllChildren(infoPtr, wineItem);
+        wineItem->cChildren = old_cChildren;
     }
 
     if (wineItem->firstChild)