Changeset 9857

Timestamp:

08/07/13 07:19:20 (11 years ago)

Author:

gkronber

Message:

#2044: merged r9839 from trunk to stable branch.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (4 diffs)

stable/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -97 +98 @@
 
     #region Content Events
-    protected virtual void Content_CheckedItemsChanged(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<T> e) {
+    protected virtual void Content_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<T> e) {
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<T>(Content_CheckedItemsChanged), sender, e);
       else {
-        foreach (T item in e.Items) {
-          foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            if (listViewItem.Checked != Content.ItemChecked(item))
-              listViewItem.Checked = Content.ItemChecked(item);
-          }
-        }
+        UpdateCheckedItemState(e.Items);
         SetNumberOfCheckItems();
       }
@@ -131 +127 @@
       }
     }
+
+    private void UpdateCheckedItemState(IEnumerable<T> items) {
+      foreach (T item in items) {
+        foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
+          var isChecked = Content.ItemChecked(item);
+          if (listViewItem.Checked != isChecked)
+            listViewItem.Checked = isChecked;
+        }
+      }
+    }
   }
 }

stable/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -137 +138 @@
         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_CheckedItemsChanged), sender, e);
       else {
-        foreach (var item in e.Items) {
-          if (itemsListView.Items[item.Index].Checked != Content.ItemChecked(item.Value))
-            itemsListView.Items[item.Index].Checked = Content.ItemChecked(item.Value);
-        }
+        UpdateCheckedItemState(e.Items);
         SetNumberOfCheckItems();
       }
@@ -154 +152 @@
     protected override void Content_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
       base.Content_ItemsMoved(sender, e);
+      UpdateCheckedItemState(e.Items);
       SetNumberOfCheckItems();
     }
@@ -173 +172 @@
       }
     }
+
+    private void UpdateCheckedItemState(IEnumerable<IndexedItem<T>> items) {
+      foreach (var item in items) {
+        var isChecked = Content.ItemChecked(item.Value);
+        if (itemsListView.Items[item.Index].Checked != isChecked)
+          itemsListView.Items[item.Index].Checked = isChecked;
+      }
+    }
   }
 }