Changeset 3281 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockForm.cs

Timestamp:

04/07/10 11:38:19 (14 years ago)

Author:

mkommend

Message:

implemented showInViewHost and moved ViewHost from Core.Views to MainForm.WindowsForm (ticket #961)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/DockForm.cs (modified) (4 diffs)

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

@@ -37 +37 @@
       InitializeComponent();
       this.view = view;
-      if (View != null) {
+      if (view != null) {
         if (view is UserControl) {
           switch (((UserControl)view).Dock) {
@@ -53 +53 @@
               break;
           }
-          Control control = (Control)View;
+          Type viewType = view.GetType();
+          Control control = (Control)view;
           control.Dock = DockStyle.Fill;
-          this.Size = control.Size;
-          viewPanel.Controls.Add(control);
-          View.CaptionChanged += new EventHandler(View_CaptionChanged);
+          this.view.CaptionChanged += new EventHandler(View_CaptionChanged);
           UpdateText();
+
+          ContentView contentView = view as ContentView;
+          if (ViewAttribute.GetShowInViewHost(viewType) && contentView != null) {
+            ViewHost viewHost = new ViewHost();
+            viewHost.ViewType = viewType;
+            viewHost.Content = contentView.Content;
+            viewHost.Dock = DockStyle.Fill;
+            viewPanel.Controls.Add(viewHost);
+          } else
+            viewPanel.Controls.Add(control);
         }
       } else {
@@ -69 +78 @@
       }
     }
-
     private IView view;
     public IView View {
-      get { return view; }
+      get { return this.view; }
     }
 
@@ -79 +87 @@
         Invoke(new MethodInvoker(UpdateText));
       else
-        this.Text = View.Caption;
+        this.Text = this.View.Caption;
     }