Changeset 2723 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainForm.cs

Timestamp:

01/29/10 16:26:43 (14 years ago)

Author:

mkommend

Message:

corrected MainForm.ActiveViewChanged event and View.IsShown property (ticket #857)

File:

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

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

@@ -86 +86 @@
       get { return this.activeView; }
       protected set {
-        if (this.activeView != value) {
+        if (this.activeView != value && (value != null || this.views.Keys.All(v => !v.IsShown))) {
           if (InvokeRequired) {
             Action<IView> action = delegate(IView activeView) { this.ActiveView = activeView; };
@@ -214 +214 @@
         if (this.views.ContainsKey(view)) {
           this.Hide(view);
+          if (this.activeView == view && views.All(v => !view.IsShown))
+            this.ActiveView = null;
           this.OnViewHidden(view);
         }