Changeset 3670 for trunk

Timestamp:

05/06/10 13:20:01 (15 years ago)

Author:

mkommend

Message:

corrected opening of views from the ViewHost (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• MainForm.cs (modified) (1 diff)
• ViewHost.cs (modified) (1 diff)

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

@@ -222 +222 @@
 
     public IContentView ShowContent(IContent content) {
+      Type viewType = MainFormManager.GetDefaultViewType(content.GetType());
+      if (viewType != null)
+        return ShowContent(content, viewType);
+      return null;
+    }
+
+    internal IContentView ShowContent(IContent content, Type viewType) {
+      if (viewType == null)
+        throw new ArgumentNullException("Could not create view of type null");
+
       IContentView view;
-      if (this.ShowContentInViewHost)
-        view = new ViewHost();
-      else
-        view = MainFormManager.CreateDefaultView(content.GetType());
+      if (this.ShowContentInViewHost) {
+        ViewHost viewHost = new ViewHost();
+        viewHost.ViewType = viewType;
+        view = viewHost;
+      } else
+        view = MainFormManager.CreateView(viewType);
 
       if (view != null) {

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

@@ -248 +248 @@
 
     private void viewsLabel_DoubleClick(object sender, EventArgs e) {
-      IContentView view = MainFormManager.MainForm.ShowContent(this.Content);
-      view.ReadOnly = this.ReadOnly;
-      view.Locked = this.Locked;
+      IContentView view = MainFormManager.GetMainForm<MainForm>().ShowContent(this.Content,this.ViewType);
+      if (view != null) {
+        view.ReadOnly = this.ReadOnly;
+        view.Locked = this.Locked;
+      }
     }
     private void viewContextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {