Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deselecting items on branch toggle in wxTR_MULTIPLE control

Browse Source 
Don't deselect all the other items when an item is collapsed or expanded
in wxGenericTreeCtrl with wxTR_MULTIPLE style, this was completely
unexpected and seems to have been accidentally introduced back in
35cf1ec63c

Closes #18680.
This commit is contained in:
Anton Triest
2020-03-16 00:30:41 +01:00
committed by Vadim Zeitlin
parent 8bc830337c
commit 0c6d6e6472
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/treectlg.cpp
View File

@@ -3789,13 +3789,19 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
GetEventHandler()->ProcessEvent(nevent); GetEventHandler()->ProcessEvent(nevent);
} }
// this facilitates multiple-item drag-and-drop // Don't deselect anything if we're just collapsing or expanding
if ( HasFlag(wxTR_MULTIPLE) && !(event.CmdDown() || event.ShiftDown()) ) // the item.
if ( !(flags & wxTREE_HITTEST_ONITEMBUTTON) )
{ {
wxArrayTreeItemIds selections; // this facilitates multiple-item drag-and-drop
if ( GetSelections(selections) > 1 ) if ( HasFlag(wxTR_MULTIPLE) &&
!(event.CmdDown() || event.ShiftDown()) )
{ {
DoSelectItem(item, true, false); wxArrayTreeItemIds selections;
if ( GetSelections(selections) > 1 )
{
DoSelectItem(item, true, false);
}
} }
} }