Changeset 9867

Timestamp:

08/07/13 15:36:28 (11 years ago)

Author:

jkarder

Message:

#1042: refactored ProgressView

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -29 +29 @@
   public partial class ProgressView : AsynchronousContentView {
     private const int DefaultCancelTimeoutMs = 3000;
-    private readonly IView parentView;
+    private readonly IView view;
 
     [Category("Custom"), Description("The time that the process is allowed to exit.")]
@@ -42 +42 @@
 
     private Control Control {
-      get { return (Control)parentView; }
+      get { return (Control)view; }
     }
 
     public bool DisposeOnFinish { get; set; }
 
-    public ProgressView() {
+    public ProgressView(IView view) {
       InitializeComponent();
-    }
-    public ProgressView(IProgress progress)
-      : this() {
+      if (view == null) throw new ArgumentNullException("view", "The view is null.");
+      if (!(view is Control)) throw new ArgumentException("The view is not a control.", "view");
+      this.view = view;
+    }
+    public ProgressView(IView view, IProgress progress)
+      : this(view) {
       Content = progress;
     }
-    public ProgressView(IView parentView)
-      : this() {
-      if (parentView == null) throw new ArgumentNullException("parentView", "The parent view is null.");
-      if (!(parentView is Control)) throw new ArgumentException("The parent view is not a control.", "parentView");
-      this.parentView = parentView;
-    }
-    public ProgressView(IView parentView, IProgress progress)
-      : this(parentView) {
-      Content = progress;
-    }
-
-    public static ProgressView Attach(IView parentView, IProgress progress, bool disposeOnFinish = false) {
-      return new ProgressView(parentView, progress) {
+
+    public static ProgressView Attach(IView view, IProgress progress, bool disposeOnFinish = false) {
+      return new ProgressView(view, progress) {
         DisposeOnFinish = disposeOnFinish
       };
@@ -106 +99 @@
       if (InvokeRequired) Invoke((Action)ShowProgress);
       else {
-        if (parentView != null) {
-          this.Left = (Control.ClientRectangle.Width / 2) - (this.Width / 2);
-          this.Top = (Control.ClientRectangle.Height / 2) - (this.Height / 2);
-          this.Anchor = AnchorStyles.None;
+        if (view != null) {
+          Left = (Control.ClientRectangle.Width / 2) - (Width / 2);
+          Top = (Control.ClientRectangle.Height / 2) - (Height / 2);
+          Anchor = AnchorStyles.None;
 
           LockBackground();
-
-          if (!Control.Controls.Contains(this))
-            Control.Controls.Add(this);
-
+          Parent = Control.Parent;
           BringToFront();
         }
@@ -127 +117 @@
       if (InvokeRequired) Invoke((Action)HideProgress);
       else {
-        if (parentView != null) {
-          if (Control.Controls.Contains(this))
-            Control.Controls.Remove(this);
-
+        if (view != null) {
+          Parent = null;
           UnlockBackground();
         }
@@ -164 +152 @@
 
     private void LockBackground() {
-      if (InvokeRequired) {
-        Invoke((Action)LockBackground);
-      } else {
-        foreach (Control c in Control.Controls)
-          c.Enabled = false;
-        Enabled = true;
+      if (InvokeRequired) Invoke((Action)LockBackground);
+      else {
+        view.Enabled = false;
       }
     }
@@ -176 +161 @@
       if (InvokeRequired) Invoke((Action)UnlockBackground);
       else {
-        foreach (Control c in Control.Controls)
-          c.Enabled = true;
-        Enabled = false;
+        view.Enabled = true;
       }
     }