Changeset 2543

Timestamp:

12/04/09 15:09:43 (14 years ago)

Author:

mkommend

Message:

changed CloseReason to FormOwnerClosing if IView.Close method is used (ticket #771)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• MainFormBase.cs (modified) (4 diffs)
• ViewBase.cs (modified) (2 diffs)

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

@@ -55 +55 @@
           this.initialized = true;
           if (this.Initialized != null)
-            this.Initialized(this,new EventArgs());
+            this.Initialized(this, new EventArgs());
         }
       }
@@ -154 +154 @@
           form.GotFocus += new EventHandler(FormActivated);
           form.FormClosing += new FormClosingEventHandler(view.OnClosing);
-          form.FormClosing += new FormClosingEventHandler(((ViewBase)view).OnClosing);
+          form.FormClosing += new FormClosingEventHandler(((ViewBase)view).OnClosingHelper);
           form.FormClosed += new FormClosedEventHandler(view.OnClosed);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
@@ -176 +176 @@
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
       else {
-        if (views.ContainsKey(view))
+        if (views.ContainsKey(view)) {
+          ((ViewBase)view).closeReason = CloseReason.FormOwnerClosing;
           views[view].Close();
+        }
       }
     }
@@ -195 +197 @@
       form.GotFocus -= new EventHandler(FormActivated);
       form.FormClosing -= new FormClosingEventHandler(view.OnClosing);
-      form.FormClosing -= new FormClosingEventHandler(((ViewBase)view).OnClosing);
+      form.FormClosing -= new FormClosingEventHandler(((ViewBase)view).OnClosingHelper);
       form.FormClosed -= new FormClosedEventHandler(view.OnClosed);
       form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);

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

@@ -35 +35 @@
       InitializeComponent();
       this.initialized = false;
+      this.closeReason = CloseReason.None;
     }
 
@@ -63 +64 @@
     }
 
-    public virtual void OnClosing(object sender, FormClosingEventArgs e) {
+    internal CloseReason closeReason;
+    internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
+      if (this.closeReason != CloseReason.None)
+        this.OnClosing(sender, new FormClosingEventArgs(this.closeReason,e.Cancel));
+      else
+        this.OnClosing(sender, e);
+      
+      this.closeReason = CloseReason.None;
+    }
+
+    public virtual void OnClosing(object sender, FormClosingEventArgs e) {      
     }