Changeset 2252 for trunk

Timestamp:

08/06/09 17:19:11 (15 years ago)

Author:

mkommend

Message:

fixed view docking (ticket #716)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test/3.2/Actions/NewEditorAction.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/Actions/NewFormAction.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/DockForm.Designer.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/DockingMainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm.Test/3.2/Actions/NewEditorAction.cs

@@ -11 +11 @@
     public void Execute(IMainForm mainform) {
       mainform.StatusStripText = "New Editor action called";
-      mainform.ShowView(new EditorView());
+      EditorView x = new EditorView();
+      x.Caption = "Editor View";
+      mainform.ShowView(x);
     }
 

trunk/sources/HeuristicLab.MainForm.Test/3.2/Actions/NewFormAction.cs

@@ -10 +10 @@
 
     public void Execute(IMainForm mainform) {
-      mainform.ShowView(new FormView());
+      mainform.StatusStripText = "New form called";
+      FormView x = new FormView();
+      x.Caption = "FormView";
+      mainform.ShowView(x);
     }
 

trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView.cs

@@ -10 +10 @@
 namespace HeuristicLab.MainForm.Test {
   public partial class FormView : ViewBase {
+    private int[] array;
     public FormView() {
       InitializeComponent();

trunk/sources/HeuristicLab.MainForm/3.2/DockForm.Designer.cs

@@ -61 +61 @@
       this.viewPanel.TabIndex = 0;
       // 
-      // ViewForm
+      // DockForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -67 +67 @@
       this.ClientSize = new System.Drawing.Size(632, 446);
       this.Controls.Add(this.viewPanel);
-      this.DockAreas = ((WeifenLuo.WinFormsUI.Docking.DockAreas)(((((WeifenLuo.WinFormsUI.Docking.DockAreas.Float | WeifenLuo.WinFormsUI.Docking.DockAreas.DockLeft)
-            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockRight)
-            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockTop)
-            | WeifenLuo.WinFormsUI.Docking.DockAreas.DockBottom
-            | WeifenLuo.WinFormsUI.Docking.DockAreas.Document)));
+      this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-      this.Name = "ViewForm";
+      this.Name = "DockForm";
       this.ShowIcon = false;
       this.ShowInTaskbar = false;
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-      this.TabText = "View";
-      this.Text = "View";
       this.ResumeLayout(false);
     }

trunk/sources/HeuristicLab.MainForm/3.2/DockingMainForm.cs

@@ -37 +37 @@
       dockPanel = new DockPanel();
       InitializeDockPanel();
+      this.IsMdiContainer = true;
       this.Controls.Add(dockPanel);
+      this.Controls.SetChildIndex(dockPanel, 0);
     }
 
@@ -43 +45 @@
 
     public override void ShowView(IView view) {
-      base.ShowView(view);
+      
       if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
       else {
+        base.ShowView(view);
         DockContent content = new DockForm(view);
-        content.TabText = content.Text;
         content.Activated += new EventHandler(DockFormActivated);
         content.FormClosing += new FormClosingEventHandler(DockFormClosing);
-        content.Show(dockPanel, DockState.Document);
+        content.Show(dockPanel);
       }
     }
@@ -57 +59 @@
       DockForm dockForm = (DockForm)sender;
       openViews.Remove(dockForm.View);
+      dockForm.Activated -= new EventHandler(DockFormActivated);
+      dockForm.FormClosing -= new FormClosingEventHandler(DockFormClosing);
     }
 
     private void DockFormActivated(object sender, EventArgs e) {
       base.activeView = ((DockForm)sender).View;
+      base.StatusStripText = ((DockForm)sender).View.Caption;
     }
 
@@ -90 +95 @@
       this.dockPanel.Name = "dockPanel";
       this.dockPanel.RightToLeftLayout = true;
-      this.dockPanel.Size = new Size(1016, 663);
-      this.dockPanel.DocumentStyle = DocumentStyle.DockingWindow;
       dockPanelGradient1.EndColor = SystemColors.ControlLight;
       dockPanelGradient1.StartColor = SystemColors.ControlLight;