Changeset 4083 for trunk

Timestamp:

07/22/10 16:04:11 (14 years ago)

Author:

mkommend

Message:

fixed bug concerning invisible views in viewhost (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• View.cs (modified) (1 diff)
• ViewHost.cs (modified) (3 diffs)

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

@@ -146 +146 @@
       }
     }
-    protected void PropagateStateChanges(Control control, Type type, PropertyInfo propertyInfo) {
+    protected virtual void PropagateStateChanges(Control control, Type type, PropertyInfo propertyInfo) {
       if (!type.GetProperties().Contains(propertyInfo))
         throw new ArgumentException("The specified type " + type + "implement the property " + propertyInfo.Name + ".");

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

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using System.Reflection;
 
 namespace HeuristicLab.MainForm.WindowsForms {
@@ -175 +176 @@
       if (activeView != null) {
         UpdateActiveMenuItem();
+        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);
@@ -215 +218 @@
 
     #region forwarding of view events
-    protected override void OnReadOnlyChanged() {
-      this.SuspendRepaint();
-      base.OnReadOnlyChanged();
-      foreach (IContentView view in cachedViews.Values)
-        view.ReadOnly = this.ReadOnly;
-      this.ResumeRepaint(true);
-    }
-    protected override void OnLockedChanged() {
-      this.SuspendRepaint();
-      base.OnLockedChanged();
-      foreach (IContentView view in cachedViews.Values)
-        view.Locked = this.Locked;
-      this.ResumeRepaint(true);
-    }
+    protected override void PropagateStateChanges(Control control, Type type, System.Reflection.PropertyInfo propertyInfo) {
+      if (!type.GetProperties().Contains(propertyInfo))
+        throw new ArgumentException("The specified type " + type + "implement the property " + propertyInfo.Name + ".");
+      if (!type.IsAssignableFrom(this.GetType()))
+        throw new ArgumentException("The specified type " + type + "must be the same or a base class / interface of this object.");
+      if (!propertyInfo.CanWrite)
+        throw new ArgumentException("The specified property " + propertyInfo.Name + " must have a setter.");
+
+      if (activeView != null) {
+        Type controlType = activeView.GetType();
+        PropertyInfo controlPropertyInfo = controlType.GetProperty(propertyInfo.Name, propertyInfo.PropertyType);
+        if (type.IsAssignableFrom(controlType) && controlPropertyInfo != null) {
+          var thisValue = propertyInfo.GetValue(this, null);
+          controlPropertyInfo.SetValue(activeView, thisValue, null);
+        }
+      }
+    }
+
     internal protected override void OnShown(ViewShownEventArgs e) {
       base.OnShown(e);