Changeset 2963

Timestamp:

03/08/10 11:23:54 (15 years ago)

Author:

mkommend

Message:

corrected behaviour of the ActiveViewChangedEvent (ticket #897)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• DockingMainForm.cs (modified) (1 diff)
• MainForm.cs (modified) (7 diffs)

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

@@ -69 +69 @@
     private void dockPanel_ActiveContentChanged(object sender, EventArgs e) {
       DockForm content = this.dockPanel.ActiveContent as DockForm;
-      this.ActiveView = content == null ? null : content.View;
+      if (content != null)
+        this.ActiveView = content.View;
     }
   }

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

@@ -86 +86 @@
       get { return this.activeView; }
       protected set {
-        if (this.activeView != value && (value != null || this.views.Keys.All(v => !v.IsShown))) {
+        if (this.activeView != value) {
           if (InvokeRequired) {
             Action<IView> action = delegate(IView activeView) { this.ActiveView = activeView; };
@@ -159 +159 @@
     }
 
-    private void ChildFormClosed(object sender, FormClosedEventArgs e) {
-      Form form = (Form)sender;
-      IView view = GetView(form);
-
-      form.Activated -= new EventHandler(FormActivated);
-      form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);
-
-      views.Remove(view);
-      this.OnViewClosed(view);
-      if (ActiveView == view)
-        ActiveView = null;
-    }
-
     private void FormActivated(object sender, EventArgs e) {
       this.ActiveView = GetView((Form)sender);
@@ -179 +166 @@
     #region create, get, show, hide, close views
     protected virtual Form CreateForm(IView view) {
-      throw new NotImplementedException("CreateForm must be implemented in subclasses of MainFormBase.");
+      throw new NotImplementedException("CreateForm must be implemented in subclasses of MainForm.");
     }
 
@@ -197 +184 @@
         if (firstTimeShown) {
           Form form = CreateForm(view);
+          view.Changed += new EventHandler(ViewChanged);
           this.views[view] = form;
           form.Activated += new EventHandler(FormActivated);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
+          
         }
         this.Show(view, firstTimeShown);
         this.OnViewShown(view, firstTimeShown);
       }
+    }
+
+    private void ViewChanged(object sender, EventArgs e) {
+      IView view = (IView)sender;
+      if (view == this.ActiveView)
+        this.OnActiveViewChanged();
     }
 
@@ -214 +209 @@
         if (this.views.ContainsKey(view)) {
           this.Hide(view);
-          if (this.activeView == view && views.All(v => !view.IsShown))
+          if (this.activeView == view)
             this.ActiveView = null;
           this.OnViewHidden(view);
@@ -222 +217 @@
 
     protected virtual void Hide(IView view) {
+    }
+
+    private void ChildFormClosed(object sender, FormClosedEventArgs e) {
+      Form form = (Form)sender;
+      IView view = GetView(form);
+
+      view.Changed -= new EventHandler(ViewChanged);
+      form.Activated -= new EventHandler(FormActivated);
+      form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);
+
+      views.Remove(view);
+      this.OnViewClosed(view);
+      if (ActiveView == view)
+        ActiveView = null;
     }
 
@@ -238 +247 @@
       else {
         if (this.views.ContainsKey(view)) {
-          ((View)view).closeReason = closeReason;
+          ((View)view).CloseReason = closeReason;
           this.CloseView(view);
         }