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.

We need to send TVN_EXPAND* on collapsing either when the user has
4a8e3395 · Huw Davies · Alexandre Julliard · 8a7fbf54 · 4a8e3395
Commit 4a8e3395 authored Nov 21, 2003 by Huw Davies Committed by Alexandre Julliard Nov 21, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

treeview.c dlls/comctl32/treeview.c +4 -2

No files found.
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3134,7 +3134,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
    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 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
    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 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
    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)