Changeset 3398

Timestamp:

04/18/10 04:33:20 (14 years ago)

Author:

mkommend

Message:

fixed cross threading issues in ViewHost (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• ControlExtensions.cs (modified) (1 diff)
• DockingMainForm.cs (modified) (1 diff)
• MultipleDocumentMainForm.cs (modified) (1 diff)
• SingleDocumentMainForm.cs (modified) (1 diff)
• View.cs (modified) (2 diffs)
• ViewHost.cs (modified) (3 diffs)

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

@@ -32 +32 @@
 
     public static void SuspendRepaint(this Control control) {
-      SendMessage(control.Handle, WM_SETREDRAW, false, 0);
+      if (control.InvokeRequired)
+        control.Invoke((Action<Control>)((c) => { c.SuspendRepaint(); }));
+      else
+        SendMessage(control.Handle, WM_SETREDRAW, false, 0);
     }
     public static void ResumeRepaint(this Control control, bool refresh) {
-      SendMessage(control.Handle, WM_SETREDRAW, true, 0);
-      if (refresh) control.Refresh();
+      if (control.InvokeRequired)
+        control.Invoke((Action<Control, bool>)((c, b) => { c.ResumeRepaint(b); }));
+      else {
+        SendMessage(control.Handle, WM_SETREDRAW, true, 0);
+        if (refresh) control.Refresh();
+      }
     }
   }

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

@@ -70 +70 @@
       IContentView contentView = view as IContentView;
       if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView.Content);
+        ViewHost viewHost = new ViewHost(contentView);
         form = new DockForm(viewHost);
       } else

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

@@ -76 +76 @@
       IContentView contentView = view as IContentView;
       if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView.Content);
+        ViewHost viewHost = new ViewHost(contentView);
         form = new DocumentForm(viewHost);
       } else

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

@@ -70 +70 @@
       IContentView contentView = view as IContentView;
       if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView.Content);
+        ViewHost viewHost = new ViewHost(contentView);
         form = new DocumentForm(viewHost);
       } else

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

@@ -58 +58 @@
     public virtual bool ReadOnly {
       get { return this.readOnly; }
-       set {
+      set {
         if (InvokeRequired) {
           Action<bool> action = delegate(bool b) { this.ReadOnly = b; };
@@ -208 +208 @@
 
     public void SuspendRepaint() {
-      ((Control)this).SuspendRepaint();
+      if (InvokeRequired)
+        Invoke((MethodInvoker)SuspendRepaint);
+      else
+        ((Control)this).SuspendRepaint();
     }
     public void ResumeRepaint(bool refresh) {
+      if (InvokeRequired)
+        Invoke((Action<bool>)ResumeRepaint,refresh);
+      else
       ((Control)this).ResumeRepaint(refresh);
     }

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

@@ -28 +28 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   [Content(typeof(object))]
-  public sealed partial class ViewHost : ContentView {
+  public sealed partial class ViewHost : AsynchronousContentView {
     private Dictionary<Type, IContentView> cachedViews;
     public ViewHost() {
@@ -41 +41 @@
       : this() {
       this.Content = content;
+    }
+
+    public ViewHost(IContentView contentView) :this(){
+      this.viewType = contentView.GetType();
+      this.Content = contentView.Content;
+      this.cachedViews.Add(contentView.GetType(), contentView);
+      this.UpdateView();
     }
 
@@ -88 +95 @@
       viewsLabel.Visible = false;
       viewPanel.Visible = false;
-      if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
-      viewPanel.Controls.Clear();
 
       if (Content != null) {