Changeset 4011 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Timestamp:

07/07/10 14:36:22 (14 years ago)

Author:

mkommend

Message:

• refactored ViewHost and various views to use fewer nested controls
• added UnitTests for ContentViews to ensure proper using of the ContentAttribute
• fixed some views which could not handle null as Content

(ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• HeuristicLabMainFormWindowsFormsPlugin.cs.frame (modified) (1 diff)
• Tests (added)
• Tests/AuthoringTests.txt (added)
• Tests/ContentViewTests.cs (added)
• Tests/HeuristicLab.MainForm.WindowsForms-3.3.Tests.csproj (added)
• Tests/Properties (added)
• Tests/Properties/AssemblyInfo.cs (added)
• Tests/Test References (added)
• Tests/Test References/HeuristicLab.MainForm.WindowsForms-3.3.accessor (added)
• ViewHost.Designer.cs (modified) (5 diffs)
• ViewHost.cs (modified) (5 diffs)
• ViewHostPanel.Designer.cs (deleted)
• ViewHostPanel.cs (deleted)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -164 +164 @@
       <DependentUpon>ViewHost.cs</DependentUpon>
     </Compile>
-    <Compile Include="ViewHostPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ViewHostPanel.Designer.cs">
-      <DependentUpon>ViewHostPanel.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLabMainFormWindowsFormsPlugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.WinFormsUI", "2.3.1")]
-  public class HeuristicLabMainFormTestPlugin : PluginBase {
+  public class HeuristicLabMainFormPlugin : PluginBase {
   }
 }

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

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.viewPanel = new HeuristicLab.MainForm.WindowsForms.ViewHostPanel();
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -52 +51 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.SuspendLayout();
-      // 
-      // viewPanel
-      // 
-      this.viewPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.viewPanel.Location = new System.Drawing.Point(0, 0);
-      this.viewPanel.Name = "viewPanel";
-      this.viewPanel.Size = new System.Drawing.Size(205, 184);
-      this.viewPanel.TabIndex = 1;
-      this.viewPanel.Resize += new System.EventHandler(this.viewPanel_Resize);
       // 
       // messageLabel
@@ -80 +68 @@
       this.viewsLabel.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Windows;
       this.viewsLabel.Location = new System.Drawing.Point(211, 0);
+      this.viewsLabel.Margin = new System.Windows.Forms.Padding(3);
       this.viewsLabel.Name = "viewsLabel";
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
@@ -100 +89 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.viewPanel);
       this.Controls.Add(this.viewsLabel);
       this.Controls.Add(this.messageLabel);
@@ -106 +94 @@
       this.Size = new System.Drawing.Size(227, 184);
       this.ResumeLayout(false);
-
     }
 
     #endregion
-
-    private ViewHostPanel viewPanel;
     private System.Windows.Forms.Label viewsLabel;
     private System.Windows.Forms.Label messageLabel;

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

@@ -33 +33 @@
       InitializeComponent();
       cachedViews = new Dictionary<Type, IContentView>();
-      viewType = null;
       startDragAndDrop = false;
       viewContextMenuStrip.IgnoredViewTypes = new List<Type>() { typeof(ViewHost) };
+
+      viewType = null;
       activeView = null;
       Content = null;
-      OnContentChanged();
-    }
-
-    private bool viewShown;
+      messageLabel.Visible = false;
+      viewsLabel.Visible = false;
+    }
+
     private Dictionary<Type, IContentView> cachedViews;
     public IEnumerable<IContentView> Views {
@@ -57 +58 @@
             if (view != null)
               view.OnHidden(EventArgs.Empty);
+            if (ActiveViewControl != null)
+              ActiveViewControl.Visible = false;
           }
           activeView = value;
           if (activeView != null) {
-            ViewType = activeView.GetType();
+            viewType = activeView.GetType();
             RegisterActiveViewEvents();
             View view = activeView as View;
             if (view != null)
               view.OnShown(new ViewShownEventArgs(view, false));
+            if (ActiveViewControl != null) {
+              ActiveViewControl.Visible = true;
+              ActiveViewControl.BringToFront();
+            }
           }
-          ActiveViewChanged();
-        }
-      }
-    }
+          OnActiveViewChanged();
+        }
+      }
+    }
+
+    private Control ActiveViewControl {
+      get { return ActiveView as Control; }
+    }
+
     private Type viewType;
     public Type ViewType {
@@ -75 +87 @@
       set {
         if (viewType != value) {
-          if (value != null && !ViewCanShowContent(value, Content))
+          if (value != null && Content != null && !ViewCanShowContent(value, Content))
             throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
                                                       value, Content.GetType()));
@@ -96 +108 @@
     protected override void OnContentChanged() {
       viewContextMenuStrip.Item = Content;
-
-      if (Content != null) {
-        if (viewContextMenuStrip.Items.Count == 0) {
-          messageLabel.Visible = true;
-          viewsLabel.Visible = false;
-          viewPanel.Visible = false;
-        } else {
-          messageLabel.Visible = false;
-          viewsLabel.Visible = true;
-          viewPanel.Visible = true;
-        }
-
+      //remove cached views which cannot show the content
+      foreach (Type type in cachedViews.Keys.ToList()) {
+        if (!ViewCanShowContent(type, Content)) {
+          Control c = cachedViews[type] as Control;
+          if (c != null) {
+            this.Controls.Remove(c);
+            c.Dispose();
+          }
+          cachedViews.Remove(type);
+        }
+      }
+
+      //change ViewType if view of ViewType can not show content or is null
+      if (Content != null && !ViewCanShowContent(viewType, Content)) {
         Type defaultViewType = MainFormManager.GetDefaultViewType(Content.GetType());
-        if (ViewType == null || !ViewCanShowContent(viewType, Content)) {
-          cachedViews.Clear();
-          if (defaultViewType == null) {
-            if (viewContextMenuStrip.Items.Count > 0)  // create first available view if default view is not available
-              ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
-          } else ViewType = defaultViewType;
-        } else {
-          foreach (Type type in cachedViews.Keys.ToList()) {
-            if (!ViewCanShowContent(type, Content)) {
-              Control c = cachedViews[type] as Control;
-              if (c != null)
-                c.Dispose();
-              cachedViews.Remove(type);
-            }
-          }
-        }
-        UpdateActiveMenuItem();
-        foreach (IContentView view in cachedViews.Values)
-          view.Content = this.Content;
+        if (defaultViewType != null)
+          ViewType = defaultViewType;
+        else if (viewContextMenuStrip.Items.Count > 0)  // create first available view if no default view is available
+          ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
+        else
+          ViewType = null;
+      }
+
+      foreach (IContentView view in cachedViews.Values)
+        view.Content = this.Content;
+
+      if (Content != null && viewType != null)
+        ActiveView = cachedViews[viewType];
+      else
+        ActiveView = null;
+
+      if (Content != null && viewContextMenuStrip.Items.Count > 0) {
+        messageLabel.Visible = false;
+        viewsLabel.Visible = true;
+      } else if (Content != null) {
+        messageLabel.Visible = true;
+        viewsLabel.Visible = false;
       } else {
         messageLabel.Visible = false;
         viewsLabel.Visible = false;
-        viewPanel.Visible = false;
       }
     }
 
     private void OnViewTypeChanged() {
-      for (int i = viewPanel.Controls.Count - 1; i > 0; i--)
-        viewPanel.Controls[i].Dispose();
-      viewPanel.Controls.Clear();
-
-      if (viewType == null || Content == null)
-        return;
-      if (!ViewCanShowContent(viewType, Content))
-        throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                          viewType, Content.GetType()));
-      if (viewPanel.Height <= 10 || viewPanel.Width <= 10) {
-        viewShown = false;
-        return;
-      }
-
-      viewShown = true;
-      UpdateActiveMenuItem();
-      IContentView view;
-      if (cachedViews.ContainsKey(ViewType))
-        view = cachedViews[ViewType];
-      else {
-        view = MainFormManager.CreateView(viewType);
-        view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
-        view.Content = Content;
-        cachedViews.Add(viewType, view);
-      }
-      this.ActiveView = view;
-      Control control = (Control)view;
-      control.Dock = DockStyle.Fill;
-      viewPanel.Controls.Add(control);
-      viewPanel.Visible = true;
-    }
-
-    private void viewPanel_Resize(object sender, EventArgs e) {
-      if (!viewShown)
-        this.OnViewTypeChanged();
+      if (viewType != null) {
+        if (!ViewCanShowContent(viewType, Content))
+          throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
+                                                            viewType, Content.GetType()));
+        IContentView view;
+        if (!cachedViews.ContainsKey(ViewType)) {
+          view = MainFormManager.CreateView(viewType);
+          view.ReadOnly = this.ReadOnly;
+          view.Locked = this.Locked;
+          view.Content = Content;
+          cachedViews.Add(viewType, view);
+          Control c = view as Control;
+          if (c != null)
+            this.Controls.Add(c);
+        }
+        UpdateActiveMenuItem();
+        ActiveView = cachedViews[viewType];
+      }
+    }
+
+    private void OnActiveViewChanged() {
+      this.SuspendRepaint();
+      if (activeView != null) {
+        UpdateActiveMenuItem();
+        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.ActiveViewChanged();
+      }
+      this.ResumeRepaint(true);
+    }
+
+    protected override void OnSizeChanged(EventArgs e) {
+      //mkommend: solution to resizing issues. taken from http://support.microsoft.com/kb/953934
+      //not implemented with a panel to reduce the number of nested controls
+      if (this.Handle != null)
+        this.BeginInvoke((Action<EventArgs>)OnSizeChangedHelper, e);
+    }
+    private void OnSizeChangedHelper(EventArgs e) {
+      base.OnSizeChanged(e);
+      this.viewsLabel.Location = new System.Drawing.Point(this.Width - this.viewsLabel.Margin.Right - this.viewsLabel.Width, this.viewsLabel.Margin.Top);
     }
 
@@ -194 +214 @@
       }
     }
+
     #region forwarding of view events
     protected override void OnReadOnlyChanged() {