comctl32: Improve right-click handling in treeview controls.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32: Improve right-click handling in treeview controls.
d6a6055b · Hugh McMaster · Alexandre Julliard · aa158039 · d6a6055b
Commit d6a6055b authored Apr 04, 2017 by Hugh McMaster Committed by Alexandre Julliard Apr 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

treeview.c dlls/comctl32/treeview.c +13 -1

No files found.
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -4347,7 +4347,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
    ht.pt.x = (short)LOWORD(lParam);
    ht.pt.y = (short)HIWORD(lParam);

-    TREEVIEW_HitTest(infoPtr, &ht);
+    if (TREEVIEW_HitTest(infoPtr, &ht))
+    {
+        infoPtr->focusedItem = ht.hItem;
+        TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem);
+        TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem);
+    }

    if (TREEVIEW_TrackMouse(infoPtr, ht.pt))
    {
@@ -4368,6 +4373,13 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
 	}
    }

+    if (ht.hItem)
+    {
+        TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem);
+        infoPtr->focusedItem = infoPtr->selectedItem;
+        TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem);
+    }
+
    return 0;
 }