Changeset 12656

Timestamp:

07/07/15 16:30:06 (9 years ago)

Author:

jkarder

Message:

#2416: merged r12615 and r12634 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (2 diffs)

stable/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -368 +368 @@
 
     protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, object>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<KeyValuePair<string, object>>(Content_CollectionReset), sender, e);
+      if (InvokeRequired) Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, object>>>)Content_CollectionReset, sender, e);
       else {
         foreach (var item in e.OldItems)
@@ -380 +379 @@
 
     private void item_ToStringChanged(object sender, EventArgs e) {
-      foreach (ListViewItem item in variableListView.Items) {
-        var variable = item.Tag as KeyValuePair<string, object>?;
-        if (variable == null || variable.Value.Value != sender) continue;
-
-        string value = (variable.Value.Value ?? "null").ToString();
-        item.SubItems[1].Text = value;
-        item.SubItems[2].Text = variable.Value.Value.GetType().ToString();
-        SetToolTipText(item, item.ImageIndex != 0);
+      if (InvokeRequired) Invoke((Action<object, EventArgs>)item_ToStringChanged, sender, e);
+      else {
+        foreach (ListViewItem item in variableListView.Items) {
+          var variable = item.Tag as KeyValuePair<string, object>?;
+          if (variable == null || variable.Value.Value != sender) continue;
+
+          string value = (variable.Value.Value ?? "null").ToString();
+          item.SubItems[1].Text = value;
+          item.SubItems[2].Text = variable.Value.Value.GetType().ToString();
+          SetToolTipText(item, item.ImageIndex != 0);
+        }
       }
     }