Changeset 10103 for branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/MainForms

Timestamp:

11/04/13 10:15:31 (11 years ago)

Author:

jkarder

Message:

#2116:

• fixed issues within the outermost control detection
• fixed visible property assignment of the breadcrumb control in ViewHost

File:

• branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (2 diffs)

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -223 +223 @@
     }
 
-    public T GetOutermostViewOfType<T>(Control childControl) where T : class, IView {
+    public T GetOutermostControlOfType<T>(Control childControl) where T : Control {
       if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
 
-      T outermostView = null;
+      T outermostControl = null;
       for (var control = childControl; control != null; control = control.Parent) {
-        var vh = control as T;
-        if (vh != null) outermostView = vh;
-      }
-      return outermostView;
+        var c = control as T;
+        if (c != null) outermostControl = c;
+      }
+      return outermostControl;
     }
 
@@ -279 +279 @@
       if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
 
-      var outermostViewHost = GetOutermostViewOfType<ViewHost>(childControl);
-      if (outermostViewHost == null)
-        throw new ArgumentException("No outermost ViewHost could be found for the specified child control.", "childControl");
+      var outermostViewHost = GetOutermostControlOfType<ViewHost>(childControl);
+      if (outermostViewHost == null) return null;
 
       if (!requireHotlinking || outermostViewHost.HotlinkingEnabled) {