Changeset 2306 for trunk/sources/HeuristicLab.MainForm/3.2/SingleDocumentMainForm.cs

Timestamp:

08/21/09 17:24:31 (15 years ago)

Author:

mkommend

Message:

added check to show every view only one time, second call of ShowView leads to focus of the view (ticket #716)

File:

• trunk/sources/HeuristicLab.MainForm/3.2/SingleDocumentMainForm.cs (modified) (2 diffs)

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

@@ -45 +45 @@
       if (InvokeRequired) Invoke((Action<IView>)ShowView, view);
       else {
-        base.ShowView(view);
-        DocumentForm form = new DocumentForm(view);
-        form.ShowInTaskbar = true;
-        form.Activated += new EventHandler(DockFormActivated);
-        form.FormClosing += new FormClosingEventHandler(view.FormClosing);
-        form.FormClosed += new FormClosedEventHandler(DockFormClosed);
-        foreach (IToolStripItem item in ToolStripItems)
-          view.StateChanged += new EventHandler(item.ViewChanged);
-        form.Show(this);
+        if (views.Contains(view)) {
+          DocumentForm documentForm = FindForm(view);
+          if (documentForm != null)
+            documentForm.Focus();
+        } else {
+          base.ShowView(view);
+          DocumentForm form = new DocumentForm(view);
+          form.ShowInTaskbar = true;
+          form.Activated += new EventHandler(DockFormActivated);
+          form.FormClosing += new FormClosingEventHandler(view.FormClosing);
+          form.FormClosed += new FormClosedEventHandler(DockFormClosed);
+          foreach (IToolStripItem item in ToolStripItems)
+            view.StateChanged += new EventHandler(item.ViewChanged);
+          form.Show(this);
+        }
       }
     }
 
     public override void CloseView(IView view) {
-      DocumentForm documentForm = this.OwnedForms.Cast<DocumentForm>().Where(df => df.View == view).Single();
-      documentForm.Close();
+      DocumentForm documentForm = FindForm(view);
+      if (documentForm != null)
+        documentForm.Close();
     }
 
@@ -79 +86 @@
       base.ActiveView = ((DocumentForm)sender).View;
     }
+
+    protected DocumentForm FindForm(IView view) {
+      IEnumerable<DocumentForm> forms = this.OwnedForms.Cast<DocumentForm>().Where(df => df.View == view);
+      if (forms.Count() == 1)
+        return forms.Single();
+      return null;
+    }
   }
 }