Changeset 3655 for trunk

Timestamp:

05/05/10 23:08:02 (15 years ago)

Author:

mkommend

Message:

corrected resizing behavior in ViewHost (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• ViewHost.Designer.cs (modified) (4 diffs)
• ViewHost.cs (modified) (3 diffs)

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

@@ -47 +47 @@
       this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewHost));
-      this.viewPanel = new ViewHostPanel();
+      this.viewPanel = new HeuristicLab.MainForm.WindowsForms.ViewHostPanel();
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -63 +63 @@
       this.viewPanel.Size = new System.Drawing.Size(205, 184);
       this.viewPanel.TabIndex = 1;
+      this.viewPanel.Resize += new System.EventHandler(this.viewPanel_Resize);
       // 
       // messageLabel
@@ -78 +79 @@
       this.viewsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.viewsLabel.ContextMenuStrip = this.viewContextMenuStrip;
-      this.viewsLabel.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Windows;
+      this.viewsLabel.Image = ((System.Drawing.Image)(resources.GetObject("viewsLabel.Image")));
       this.viewsLabel.Location = new System.Drawing.Point(211, 0);
       this.viewsLabel.Name = "viewsLabel";
@@ -91 +92 @@
       // viewContextMenuStrip
       // 
+      this.viewContextMenuStrip.IgnoredViewTypes = ((System.Collections.Generic.IEnumerable<System.Type>)(resources.GetObject("viewContextMenuStrip.IgnoredViewTypes")));
       this.viewContextMenuStrip.Item = null;
       this.viewContextMenuStrip.Name = "viewContextMenuStrip";

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

@@ -41 +41 @@
     }
 
+    private bool viewShown;
     private Dictionary<Type, IContentView> cachedViews;
     public IEnumerable<IContentView> Views {
@@ -138 +139 @@
         throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
                                                           viewType, Content.GetType()));
-      if (viewPanel.Height <= 10 || viewPanel.Width <= 10)
+      if (viewPanel.Height <= 10 || viewPanel.Width <= 10) {
+        viewShown = false;
         return;
-
+      }
+
+      viewShown = true;
       UpdateActiveMenuItem();
       IContentView view;
@@ -159 +163 @@
     }
 
+    private void viewPanel_Resize(object sender, EventArgs e) {
+      if (!viewShown)
+        this.OnViewTypeChanged();
+    }
+
     private void RegisterActiveViewEvents() {
       activeView.Changed += new EventHandler(activeView_Changed);