Skip to content

fix for shift-click multiselection #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2015
Merged

fix for shift-click multiselection #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions GongSolutions.Wpf.DragDrop/DragDrop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,9 +716,8 @@ private static void DragSource_PreviewMouseLeftButtonDown(object sender, MouseBu
var itemsControl = sender as ItemsControl;

if (m_DragInfo.VisualSourceItem != null && itemsControl != null && itemsControl.CanSelectMultipleItems()) {
var selectedItems = itemsControl.GetSelectedItems().Cast<object>();

if (selectedItems.Count() > 1 && selectedItems.Contains(m_DragInfo.SourceItem)) {
var selectedItems = itemsControl.GetSelectedItems().OfType<object>().ToList();
if (selectedItems.Count() > 1 && selectedItems.Contains(m_DragInfo.SourceItem) && (Keyboard.Modifiers & ModifierKeys.Shift) == 0) {
m_ClickSupressItem = m_DragInfo.SourceItem;
e.Handled = true;
}
Expand All @@ -734,7 +733,7 @@ private static void DragSource_PreviewMouseLeftButtonUp(object sender, MouseButt
if (itemsControl != null && m_DragInfo != null && m_ClickSupressItem == m_DragInfo.SourceItem) {
if ((Keyboard.Modifiers & ModifierKeys.Control) != 0) {
itemsControl.SetItemSelected(m_DragInfo.SourceItem, false);
} else {
} else if ((Keyboard.Modifiers & ModifierKeys.Shift) == 0) {
itemsControl.SetSelectedItem(m_DragInfo.SourceItem);
}
}
Expand Down
25 changes: 23 additions & 2 deletions GongSolutions.Wpf.DragDrop/Utilities/ItemsControlExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,15 @@ public static void SetSelectedItem(this ItemsControl itemsControl, object item)
((MultiSelector)itemsControl).SelectedItem = null;
((MultiSelector)itemsControl).SelectedItem = item;
} else if (itemsControl is ListBox) {
((ListBox)itemsControl).SelectedItem = null;
((ListBox)itemsControl).SelectedItem = item;
var selectionMode = ((ListBox)itemsControl).SelectionMode;
try {
// change SelectionMode for UpdateAnchorAndActionItem
((ListBox)itemsControl).SelectionMode = SelectionMode.Single;
((ListBox)itemsControl).SelectedItem = null;
((ListBox)itemsControl).SelectedItem = item;
} finally {
((ListBox)itemsControl).SelectionMode = selectionMode;
}
} else if (itemsControl is TreeView) {
((TreeView)itemsControl).SetValue(TreeView.SelectedItemProperty, null);
((TreeView)itemsControl).SetValue(TreeView.SelectedItemProperty, item);
Expand All @@ -241,6 +248,20 @@ public static void SetSelectedItem(this ItemsControl itemsControl, object item)
}
}

public static object GetSelectedItem(this ItemsControl itemsControl)
{
if (itemsControl is MultiSelector) {
return ((MultiSelector)itemsControl).SelectedItem;
} else if (itemsControl is ListBox) {
return ((ListBox)itemsControl).SelectedItem;
} else if (itemsControl is TreeView) {
return ((TreeView)itemsControl).GetValue(TreeView.SelectedItemProperty);
} else if (itemsControl is Selector) {
return ((Selector)itemsControl).SelectedItem;
}
return null;
}

public static IEnumerable GetSelectedItems(this ItemsControl itemsControl)
{
//if (itemsControl.GetType().IsAssignableFrom(typeof(MultiSelector)))
Expand Down