Changeset 3301

Timestamp:

04/11/10 19:32:52 (15 years ago)

Author:

mkommend

Message:

implemented fix for ticket #966

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• MainForm.cs (modified) (3 diffs)
• View.cs (modified) (2 diffs)

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

@@ -31 +31 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Collections;
+using WeifenLuo.WinFormsUI.Docking;
 
 namespace HeuristicLab.MainForm.WindowsForms {
@@ -162 +163 @@
       this.ActiveView = GetView((Form)sender);
     }
+
+    protected override void OnFormClosing(FormClosingEventArgs e) {
+      foreach (KeyValuePair<IView,Form > pair in this.views) {
+        DockForm dockForm = pair.Value as DockForm;
+        View view = pair.Key as View;
+        if (view != null && dockForm != null && dockForm.DockState != DockState.Document) {
+          view.CloseReason = CloseReason.ApplicationExitCall;
+          view.OnClosingHelper(dockForm, e);
+        }
+      }
+      base.OnFormClosing(e);
+    }
+
+    protected override void OnFormClosed(FormClosedEventArgs e) {
+      foreach (KeyValuePair<IView, Form> pair in this.views.ToList()) {
+        DockForm dockForm = pair.Value as DockForm;
+        View view = pair.Key as View;
+        if (view != null && dockForm != null && dockForm.DockState != DockState.Document) {
+          view.CloseReason = CloseReason.ApplicationExitCall;
+          view.OnClosedHelper(dockForm, e);
+          dockForm.Close();
+        }
+      }
+      base.OnFormClosed(e);
+    }
     #endregion
 
@@ -188 +214 @@
           form.Activated += new EventHandler(FormActivated);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
-          
+
         }
         this.Show(view, firstTimeShown);

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

@@ -119 +119 @@
     }
 
-    private void OnClosingHelper(object sender, FormClosingEventArgs e) {
+    internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
+      FormClosingEventArgs eventArgs = new FormClosingEventArgs(this.closeReason, e.Cancel);
       if (this.closeReason != CloseReason.None)
-        this.OnClosing(new FormClosingEventArgs(this.closeReason, e.Cancel));
+        this.OnClosing(eventArgs);
       else
         this.OnClosing(e);
 
+      if (eventArgs.Cancel != e.Cancel)
+        e.Cancel = eventArgs.Cancel;
       this.closeReason = CloseReason.None;
     }
@@ -131 +134 @@
     }
 
-    private void OnClosedHelper(object sender, FormClosedEventArgs e) {
+    internal void OnClosedHelper(object sender, FormClosedEventArgs e) {
       if (this.closeReason != CloseReason.None)
         this.OnClosed(new FormClosedEventArgs(this.closeReason));