Changeset 10106 for branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3

Timestamp:

11/05/13 10:52:45 (11 years ago)

Author:

jkarder

Message:

#2116:

• refactored outermost view host detection
• fixed update logic of breadcrumb trail
• fixed some views

Location:

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• Controls/ViewHost.cs (modified) (5 diffs)
• Views/View.cs (modified) (2 diffs)

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -42 +41 @@
       viewsLabel.Visible = false;
       viewsLabelVisible = true;
-      IsValidOutermostViewhost = true;
 
       breadcrumbControl.ViewHost = this;
@@ -61 +59 @@
 
     public bool HotlinkingEnabled { get; set; }
-
-    [DefaultValue(true)]
-    public bool IsValidOutermostViewhost { get; set; }
 
     private IContentView cachedView;
@@ -371 +366 @@
       if (!newCrumbs.Any()) return;
       var ll = new LinkedList<IContent>();
-      foreach (var c in oldCrumbs) {
-        if (c != newCrumbs.First())
-          ll.AddLast(c);
-        else break;
+      if (newCrumbs.Contains(oldCrumbs.LastOrDefault())) {
+        foreach (var c in oldCrumbs) {
+          if (c != newCrumbs.First())
+            ll.AddLast(c);
+          else break;
+        }
       }
       foreach (var c in newCrumbs)
@@ -382 +379 @@
 
     private void PerformOutermostViewHostDetection() {
-      if (!IsValidOutermostViewhost) return;
-      var mainForm = MainFormManager.GetMainForm<MainForm>();
-      if (mainForm == null) return; // needed for designer
-      var outermostViewHost = mainForm.GetOutermostControlOfType<ViewHost>(this);
-      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = outermostViewHost == this;
+      var parentContentViews = GetParentViewsOfType<ContentView>();
+      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = !parentContentViews.Any();
     }
     #endregion

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -261 +262 @@
         ((Control)this).ResumeRepaint(refresh);
     }
+
+    public IEnumerable<T> GetParentViewsOfType<T>() where T : View {
+      for (var view = Parent; view != null; view = view.Parent)
+        if (view is View) yield return view as T;
+    }
   }
 }