Changeset 17928 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.MainForm.WindowsForms

Timestamp:

04/06/21 13:13:32 (4 years ago)

Author:

dpiringe

Message:

#3026

• merged trunk into branch

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (8 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (8 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -25 +25 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   internal sealed partial class ProgressView : UserControl {
-    private readonly Control control;
-    public Control Control {
-      get { return control; }
-    }
-
-    private readonly IProgress content;
-    public IProgress Content {
-      get { return content; }
-    }
-
-    public ProgressView(Control control, IProgress content)
+    public Control TargetControl { get; }
+    public IProgress Content { get; }
+
+    public ProgressView(Control targetControl, IProgress content)
       : 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");
+      if (targetControl == null) throw new ArgumentNullException(nameof(targetControl));
+      if (targetControl.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(nameof(content));
       InitializeComponent();
 
-      this.control = control;
-      this.content = content;
+      this.TargetControl = targetControl;
+      this.Content = content;
 
       if (content.ProgressState != ProgressState.Finished)
@@ -52 +45 @@
     protected override void Dispose(bool disposing) {
       DeregisterContentEvents();
-      HideProgress();
-
-      if (disposing && (components != null)) {
+
+      if (!TargetControl.IsDisposed)
+        HideProgress();
+
+      if (disposing && components != null) {
         components.Dispose();
       }
@@ -101 +96 @@
 
     private void ShowProgress() {
-      if (Control.InvokeRequired) {
-        Control.Invoke((Action)ShowProgress);
+      if (TargetControl.InvokeRequired) {
+        TargetControl.Invoke((Action)ShowProgress);
         return;
       }
       if (Parent != null) return;
 
-      Left = (Control.ClientRectangle.Width / 2) - (Width / 2);
-      Top = (Control.ClientRectangle.Height / 2) - (Height / 2);
+      Left = (TargetControl.ClientRectangle.Width / 2) - (Width / 2);
+      Top = (TargetControl.ClientRectangle.Height / 2) - (Height / 2);
       Anchor = AnchorStyles.None;
 
@@ -115 +110 @@
       UpdateButtonsState();
 
-      Control.SuspendRepaint();
-      Control.Enabled = false;
-      Parent = Control.Parent;
+      TargetControl.SuspendRepaint();
+      TargetControl.Enabled = false;
+      RegisterTargetControlEvents();
+      Parent = TargetControl.Parent;
       BringToFront();
-      Control.ResumeRepaint(true);
+      TargetControl.ResumeRepaint(true);
       Visible = true;
     }
 
     private void HideProgress() {
-      if (Control.InvokeRequired) {
-        Control.Invoke((Action)HideProgress);
+      if (TargetControl.InvokeRequired) {
+        TargetControl.Invoke((Action)HideProgress);
         return;
       }
@@ -131 +127 @@
 
       Visible = false;
-      Control.SuspendRepaint();
-      Control.Enabled = true;
-      Control.ResumeRepaint(true);
+      TargetControl.SuspendRepaint();
+      TargetControl.Enabled = true;
+      DeregisterTargetControlEvents();
       Parent = null;
+      TargetControl.ResumeRepaint(TargetControl.Visible);
+    }
+
+
+    private void RegisterTargetControlEvents() {
+      TargetControl.Disposed += TargetControl_Disposed;
+      TargetControl.VisibleChanged += TargetControl_VisibleChanged;
+      TargetControl.ParentChanged += TargetControl_ParentChanged;
+    }
+
+    private void DeregisterTargetControlEvents() {
+      TargetControl.Disposed -= TargetControl_Disposed;
+      TargetControl.VisibleChanged -= TargetControl_VisibleChanged;
+      TargetControl.ParentChanged -= TargetControl_ParentChanged;
+    }
+
+    private void TargetControl_Disposed(object sender, EventArgs e) {
+      Dispose();
+    }
+    private void TargetControl_VisibleChanged(object sender, EventArgs e) {
+      Visible = TargetControl.Visible;
+    }
+    private void TargetControl_ParentChanged(object sender, EventArgs e) {
+      Parent = TargetControl.Parent;
     }
 
     private void UpdateProgressState() {
-      if (Control.InvokeRequired) {
-        Control.Invoke((Action)UpdateProgressState);
+      if (TargetControl.InvokeRequired) {
+        TargetControl.Invoke((Action)UpdateProgressState);
         return;
       }
@@ -150 +170 @@
 
     private void UpdateProgressMessage() {
-      if (Control.InvokeRequired) {
-        Control.Invoke((Action)UpdateProgressMessage);
-        return;
-      }
-
-      messageLabel.Text = content.Message;
+      if (TargetControl.InvokeRequired) {
+        TargetControl.Invoke((Action)UpdateProgressMessage);
+        return;
+      }
+
+      messageLabel.Text = Content.Message;
     }
 
     private void UpdateProgressValue() {
+      if (Disposing || IsDisposed) return;
       if (InvokeRequired) {
         Invoke((Action)UpdateProgressValue);
@@ -167 +188 @@
         case ProgressMode.Determinate:
           progressBar.Style = ProgressBarStyle.Continuous;
-          progressBar.Value = (int)Math.Round(progressBar.Minimum + content.ProgressValue * (progressBar.Maximum - progressBar.Minimum));
+          progressBar.Value = (int)Math.Round(progressBar.Minimum + Content.ProgressValue * (progressBar.Maximum - progressBar.Minimum));
           break;
         case ProgressMode.Indeterminate:
@@ -174 +195 @@
           break;
         default:
-          throw new NotImplementedException($"Invalid Progress Mode: {content.ProgressMode}");
+          throw new NotImplementedException($"Invalid Progress Mode: {Content.ProgressMode}");
       }
     }
 
     private void UpdateButtonsState() {
-      if (Control.InvokeRequired) {
-        Control.Invoke((Action)UpdateButtonsState);
+      if (TargetControl.InvokeRequired) {
+        TargetControl.Invoke((Action)UpdateButtonsState);
         return;
       }
 
       stopButton.Visible = Content.CanBeStopped;
-      stopButton.Enabled = Content.CanBeStopped && content.ProgressState == ProgressState.Started;
+      stopButton.Enabled = Content.CanBeStopped && Content.ProgressState == ProgressState.Started;
 
       cancelButton.Visible = Content.CanBeCanceled;
-      cancelButton.Enabled = Content.CanBeCanceled && content.ProgressState == ProgressState.Started;
+      cancelButton.Enabled = Content.CanBeCanceled && Content.ProgressState == ProgressState.Started;
     }
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -170 +170 @@
     }
 
+
     private void OnViewTypeChanged() {
-      if (viewType != null) {
-        if (!ViewCanShowContent(viewType, Content))
-          throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                            viewType, Content.GetType()));
-        IContentView view = MainFormManager.CreateView(viewType);
-        view.Locked = Locked;
-        view.ReadOnly = ReadOnly;
-        ActiveView = view; //necessary to allow the views to change the status of the viewhost
-        view.Content = Content;
-
-        UpdateActiveMenuItem();
-      }
+      if (viewType == null) return;
+      if (!ViewCanShowContent(viewType, Content))
+        throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".", viewType, Content.GetType()));
+
+      IContentView view = MainFormManager.CreateView(viewType);
+      view.Locked = Locked;
+      view.ReadOnly = ReadOnly;
+      ActiveView = view; //necessary to allow the views to change the status of the viewhost
+      view.Content = Content;
+
+      UpdateActiveMenuItem();
+
     }
 
@@ -188 +189 @@
       activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
       activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
+      activeView.ReadOnlyChanged += new EventHandler(activeView_ReadOnlyChanged);
       activeView.Changed += new EventHandler(activeView_Changed);
     }
@@ -193 +195 @@
       activeView.CaptionChanged -= new EventHandler(activeView_CaptionChanged);
       activeView.LockedChanged -= new EventHandler(activeView_LockedChanged);
+      activeView.ReadOnlyChanged -= new EventHandler(activeView_ReadOnlyChanged);
       activeView.Changed -= new EventHandler(activeView_Changed);
     }
@@ -202 +205 @@
       configurationLabel.Enabled = !activeView.Locked;
     }
+    private void activeView_ReadOnlyChanged(object sender, EventArgs e) {
+      ReadOnly = activeView.ReadOnly;
+    }
+
     private void activeView_Changed(object sender, EventArgs e) {
       OnChanged();
@@ -228 +235 @@
 
     #region forwarding of view events
-    internal protected override void OnShown(ViewShownEventArgs e) {
+    protected internal override void OnShown(ViewShownEventArgs e) {
       base.OnShown(e);
       View view = ActiveView as View;
@@ -234 +241 @@
         view.OnShown(e);
     }
-    internal protected override void OnHidden(EventArgs e) {
+    protected internal override void OnHidden(EventArgs e) {
       base.OnHidden(e);
       View view = ActiveView as View;
@@ -240 +247 @@
         view.OnHidden(e);
     }
-    internal protected override void OnClosing(FormClosingEventArgs e) {
+    protected internal override void OnClosing(FormClosingEventArgs e) {
       base.OnClosing(e);
       View view = ActiveView as View;
@@ -246 +253 @@
         view.OnClosing(e);
     }
-    internal protected override void OnClosed(FormClosedEventArgs e) {
+    protected internal override void OnClosed(FormClosedEventArgs e) {
       base.OnClosed(e);
       View view = ActiveView as View;