Changeset 3403 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockingMainForm.cs

Timestamp:

04/19/10 00:09:19 (14 years ago)

Author:

mkommend

Message:

enhanced viewHost (forwarding of view events, activeView property,...) (ticket #972)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockingMainForm.cs (modified) (3 diffs)

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

@@ -45 +45 @@
     }
 
-    protected override void Show(IView view, bool firstTimeShown) {
-      if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
+    protected override void ShowView(IView view, bool firstTimeShown) {
+      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
       else {
-        base.Show(view, firstTimeShown);
+        base.ShowView(view, firstTimeShown);
         if (firstTimeShown)
           ((DockForm)GetForm(view)).Show(dockPanel);
@@ -59 +59 @@
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        Form form = base.GetForm(view);
+        Form form = this.GetForm(view);
         if (form != null) {
           ((DockForm)form).Hide();
@@ -72 +72 @@
         ViewHost viewHost = new ViewHost(contentView);
         form = new DockForm(viewHost);
-      } else
+        this.AddViewFormCombination(viewHost, form);
+      } else {
         form = new DockForm(view);
+        this.AddViewFormCombination(view, form);
+      }
       return form;
     }