Changeset 16529 for branches/2520_PersistenceReintegration/HeuristicLab.MainForm.WindowsForms

Timestamp:

01/10/19 15:40:44 (6 years ago)

Author:

gkronber

Message:

#2520: merged r16491:16528 from trunk to persistence branch

Location:

branches/2520_PersistenceReintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (3 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs

@@ -46 +46 @@
       }
     }
-
-    public static IEnumerable<Control> GetNestedControls(this Control control, Func<Control, bool> condition = null) {
-      if (control == null) yield break;
-      if (condition == null) condition = (c) => true;
-
-      Queue<Control> unprocessed = new Queue<Control>();
-      unprocessed.Enqueue(control);
-
-      while (unprocessed.Count > 0) {
-        Control c = unprocessed.Dequeue();
-        if (condition(c)) yield return c;
-        foreach (Control child in c.Controls)
-          unprocessed.Enqueue(child);
-      }
-    }
   }
 }

branches/2520_PersistenceReintegration/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -38 +38 @@
       : base() {
       if (control == null) throw new ArgumentNullException("control");
+      if (control.Parent == null) throw new InvalidOperationException("A Progress can only be shown on controls that have a Parent-control. Therefore, Dialogs and Forms cannot have an associated ProgressView.");
       if (content == null) throw new ArgumentNullException("content");
       InitializeComponent();
@@ -114 +115 @@
       UpdateButtonsState();
 
+      Control.SuspendRepaint();
       Control.Enabled = false;
       Parent = Control.Parent;
       BringToFront();
+      Control.ResumeRepaint(true);
       Visible = true;
     }
@@ -128 +131 @@
 
       Visible = false;
+      Control.SuspendRepaint();
       Control.Enabled = true;
+      Control.ResumeRepaint(true);
       Parent = null;
     }