Changeset 4435 for trunk/sources/HeuristicLab.MainForm.WindowsForms

Timestamp:

09/19/10 19:43:05 (14 years ago)

Author:

mkommend

Message:

Adjusted the SetEnabledStateOfControls method in all views, added the Enabled property into the IView interface and adapted the ViewHost, View and ContentView class (ticket #1155).

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• ContentView.cs (modified) (2 diffs)
• View.cs (modified) (3 diffs)
• ViewHost.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ContentView.cs

@@ -67 +67 @@
         } else {
           if (value != locked) {
-            this.SuspendRepaint();
             locked = value;
             OnLockedChanged();
-            this.SetEnabledStateOfControls();
+            SetEnabledStateOfControls();
             PropertyInfo prop = typeof(IContentView).GetProperty("Locked");
             PropagateStateChanges(this, typeof(IContentView), prop);
             OnChanged();
-            this.ResumeRepaint(true);
           }
         }
@@ -111 +109 @@
     /// </summary>
     protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      Enabled = Content != null;
     }
   }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/View.cs

@@ -65 +65 @@
         } else {
           if (value != readOnly) {
-            this.SuspendRepaint();
             this.readOnly = value;
-            this.OnReadOnlyChanged();
-            this.SetEnabledStateOfControls();
+            OnReadOnlyChanged();
+            SetEnabledStateOfControls();
             PropertyInfo prop = typeof(IView).GetProperty("ReadOnly");
             PropagateStateChanges(this, typeof(IView), prop);
-            this.ResumeRepaint(true);
+            OnChanged();
           }
         }
       }
     }
+
+    bool IView.Enabled {
+      get { return base.Enabled; }
+      set {
+        if (base.Enabled != value) {
+          this.SuspendRepaint();
+          base.Enabled = value;
+          bool isTopLevelView = MainFormManager.MainForm.Views.Contains(this);
+          this.ResumeRepaint(isTopLevelView);
+        }
+      }
+    }
+
+    protected override void OnEnabledChanged(EventArgs e) {
+      base.OnEnabledChanged(e);
+      if (Enabled) SetEnabledStateOfControls();
+    }
+
     /// <summary>
     /// This method is called if the ReadyOnly property of the View changes to update the controls of the view.
@@ -160 +177 @@
           var thisValue = propertyInfo.GetValue(this, null);
           controlPropertyInfo.SetValue(c, thisValue, null);
-        } else
-          PropagateStateChanges(c, type, propertyInfo);
+        } else PropagateStateChanges(c, type, propertyInfo);
       }
     }
@@ -226 +242 @@
     }
 
-    public new bool Enabled {
-      get { return base.Enabled; }
-      set {
-        SuspendRepaint();
-        base.Enabled = value;
-        ResumeRepaint(true);
-      }
-    }
 
     public void SuspendRepaint() {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -61 +61 @@
             View view = activeView as View;
             if (view != null) {
+              view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+              view.Size = new System.Drawing.Size(this.Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
               view.OnShown(new ViewShownEventArgs(view, false));
               Controls.Add(view);
             }
           } else viewType = null;
-          OnActiveViewChanged();
         }
       }
@@ -84 +85 @@
           OnViewTypeChanged();
         }
-      }
-    }
-
-    public new bool Enabled {
-      get { return base.Enabled; }
-      set {
-        base.Enabled = value;
-        this.viewsLabel.Enabled = value;
       }
     }
@@ -136 +129 @@
         IContentView view;
         view = MainFormManager.CreateView(viewType);
+        view.Locked = this.Locked;
         view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
         ActiveView = view; //necessary to allow the views to change the status of the viewhost
         view.Content = Content;
@@ -145 +138 @@
     }
 
-    private void OnActiveViewChanged() {
-      this.SuspendRepaint();
-      if (activeView != null) {
-        this.ActiveView.ReadOnly = this.ReadOnly;
-        this.ActiveView.Locked = this.Locked;
-        this.ActiveViewControl.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
-        this.ActiveViewControl.Size = new System.Drawing.Size(this.Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
-      }
-      this.ResumeRepaint(true);
-    }
-
     private void RegisterActiveViewEvents() {
-      activeView.Changed += new EventHandler(activeView_Changed);
       activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
+      activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
     }
     private void DeregisterActiveViewEvents() {
-      activeView.Changed -= new EventHandler(activeView_Changed);
-      activeView.CaptionChanged -= new EventHandler(activeView_CaptionChanged);
+      activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
+      activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
     }
     private void activeView_CaptionChanged(object sender, EventArgs e) {
-      this.ActiveViewChanged();
-    }
-    private void activeView_Changed(object sender, EventArgs e) {
-      this.ActiveViewChanged();
-    }
-    private void ActiveViewChanged() {
-      if (ActiveView != null) {
-        this.Caption = this.ActiveView.Caption;
-        this.ReadOnly = this.ActiveView.ReadOnly;
-        this.Locked = this.ActiveView.Locked;
-      }
+      this.Caption = activeView.Caption;
+    }
+    private void activeView_LockedChanged(object sender, EventArgs e) {
+      this.Locked = activeView.Locked;
     }