Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Optimization.Views/3.3/ResultCollectionView.cs

Timestamp:

06/28/18 11:13:37 (6 years ago)

Author:

gkronber

Message:

#2522: merged trunk changes from r13402:15972 to branch resolving conflicts where necessary

Location:

branches/2522_RefactorPluginInfrastructure

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/ResultCollectionView.cs (modified) (3 diffs)

branches/2522_RefactorPluginInfrastructure

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Optimization.Views/3.3/ResultCollectionView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using System.Windows.Forms;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -58 +59 @@
       }
     }
+
+    protected override void Item_ToStringChanged(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Item_ToStringChanged), sender, e);
+        return;
+      }
+
+      base.Item_ToStringChanged(sender, e);
+      Application.DoEvents();
+    }
   }
 }

@@ -24 +24 @@
 protoc.exe
 obj
+.vs