Changeset 5956

Timestamp:

04/05/11 16:30:07 (14 years ago)

Author:

mkommend

Message:

#1464: Corrected behavior of ViewHost and SymbolicExpressionTreeChart.

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -106 +106 @@
     protected override void OnResize(EventArgs e) {
       base.OnResize(e);
-      if (this.Width == 0 || this.Height == 0)
+      if (this.Width <= 1 || this.Height <= 1)
         this.image = new Bitmap(1, 1);
       else

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

@@ -80 +80 @@
       // viewContextMenuStrip
       // 
-      this.viewContextMenuStrip.IgnoredViewTypes = System.Linq.Enumerable.Empty<System.Type>();
+      this.viewContextMenuStrip.IgnoredViewTypes = System.Type.EmptyTypes;
       this.viewContextMenuStrip.Item = null;
       this.viewContextMenuStrip.Name = "viewContextMenuStrip";

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

@@ -75 +75 @@
 
           if (activeView != null) {
-            #region disposed cachedView
+            #region dispose cachedView
             if (activeView != cachedView) {
               if (cachedView != null) cachedView.Content = null;  //needed to deregister events
@@ -93 +93 @@
             if (view != null) {
               view.Visible = true;
-              view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
-              view.Size = new Size(Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
-              view.Dock = viewsLabelVisible ? DockStyle.None : DockStyle.Fill;
+              if (ViewsLabelVisible) {
+                view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+                view.Size = new Size(Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
+              } else view.Dock = DockStyle.Fill;
+              if (!Controls.Contains((view))) Controls.Add(view);
               view.OnShown(new ViewShownEventArgs(view, false));
-              if (!Controls.Contains((view))) Controls.Add(view);
             }
           } else viewType = null;