Changeset 2723 for trunk/sources

Timestamp:

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

Author:

mkommend

Message:

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

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• MainForm.cs (modified) (2 diffs)
• View.cs (modified) (7 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);
         }

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

@@ -58 +58 @@
     public bool IsShown {
       get { return this.isShown; }
+      private set { this.isShown = value; }
     }
 
@@ -64 +65 @@
       bool firstTimeShown = mainform.GetForm(this) == null;
 
-      MainFormManager.GetMainForm<MainForm>().ShowView(this,firstTimeShown);
+      this.IsShown = true;
+      mainform.ShowView(this, firstTimeShown);
       if (firstTimeShown) {
         Form form = mainform.GetForm(this);
@@ -70 +72 @@
         form.FormClosing += new FormClosingEventHandler(OnClosingHelper);
       }
-      this.OnShown(new ViewShownEventArgs(this,firstTimeShown));
+      this.OnShown(new ViewShownEventArgs(this, firstTimeShown));
     }
 
@@ -76 +78 @@
       MainForm mainform = MainFormManager.GetMainForm<MainForm>();
       Form form = mainform.GetForm(this);
-      if (form != null)
+      if (form != null) {
+        this.IsShown = false;
         mainform.CloseView(this);
+      }
     }
 
@@ -83 +87 @@
       MainForm mainform = MainFormManager.GetMainForm<MainForm>();
       Form form = mainform.GetForm(this);
-      if (form != null) 
-        mainform.CloseView(this,closeReason);
+      if (form != null) {
+        this.IsShown = false;
+        mainform.CloseView(this, closeReason);
+      }
     }
 
     public new void Hide() {
+      this.IsShown = false;
       MainFormManager.GetMainForm<MainForm>().HideView(this);
       this.OnHidden(new EventArgs());
@@ -107 +114 @@
 
     protected virtual void OnShown(ViewShownEventArgs e) {
-      this.isShown = true;
     }
 
     protected virtual void OnHidden(EventArgs e) {
-      this.isShown = false;
     }
 
@@ -140 +145 @@
 
     protected virtual void OnClosed(FormClosedEventArgs e) {
-      this.isShown = false;
     }