Changeset 2358

Timestamp:

09/15/09 16:00:27 (15 years ago)

Author:

mkommend

Message:

set ActiveView to null during ViewClosed, if the active view is being closed (ticket #743)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• DockingMainForm.cs (modified) (1 diff)
• MainFormBase.cs (modified) (3 diffs)
• MultipleDocumentMainForm.cs (modified) (1 diff)
• SingleDocumentMainForm.cs (modified) (1 diff)

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

@@ -73 +73 @@
     private void DockFormClosed(object sender, FormClosedEventArgs e) {
       DockForm dockForm = (DockForm)sender;
-      views.Remove(dockForm.View);
-      if (views.Count == 0)
-        ActiveView = null;
-
       ViewClosed(dockForm.View);
       dockForm.Activated -= new EventHandler(DockFormActivated);

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

@@ -98 +98 @@
       get { return this.userInterfaceItemType; }
       protected set { this.userInterfaceItemType = value; }
+    }
+
+    protected List<IView> views;
+    public IEnumerable<IView> Views {
+      get { return views; }
     }
 
@@ -140 +145 @@
     }
 
-    protected List<IView> views;
-    public IEnumerable<IView> Views {
-      get { return views; }
-    }
+  
 
     public virtual void ShowView(IView view) {
@@ -162 +164 @@
 
     protected virtual void ViewClosed(IView view) {
+      views.Remove(view);
+      if (ActiveView == view)
+        ActiveView = null;
     }
     #endregion

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

@@ -84 +84 @@
     private void MultipleDocumentFormClosed(object sender, FormClosedEventArgs e) {
       DocumentForm form = (DocumentForm)sender;
-      views.Remove(form.View);
-      if (views.Count == 0)
-        ActiveView = null;
-
       ViewClosed(form.View);
       form.Activated -= new EventHandler(MultipleDocumentFormActivated);

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

@@ -74 +74 @@
     private void DockFormClosed(object sender, FormClosedEventArgs e) {
       DocumentForm form = (DocumentForm)sender;
-      views.Remove(form.View);
-      if (views.Count == 0)
-        ActiveView = null;
-
       ViewClosed(form.View);
       form.Activated -= new EventHandler(DockFormActivated);