Changeset 15087

Timestamp:

06/29/17 11:47:10 (7 years ago)

Author:

mkommend

Message:

#2783: Reverse merge of unrelated changes r15086 in CheckedItemListView.

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -106 +106 @@
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
       if (data != null)
-        validDragOperation = true;
+        validDragOperation = Content.Select(x => x.ToString()).SequenceEqual(data.Select(x => x.ToString()));
       else
         base.itemsListView_DragEnter(sender, e);
@@ -126 +126 @@
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
       if (data != null) {
-        for (int i = 0; i < data.Count; i++) {
-          var dataItem = data[i];
-          var contentItem = Content.FirstOrDefault(ci => ci.ToString() == dataItem.ToString());
-          if (contentItem == null) continue;
-          Content.SetItemCheckedState(contentItem, data.ItemChecked(dataItem));
+        for (int i = 0; i < Content.Count; i++) {
+          Content.SetItemCheckedState(Content[i], data.ItemChecked(data[i]));
         }
       } else