Some more work on FSE..

1 files changed, 25 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
index 64e2dbf84..0ef8d0ecc 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
@@ -184,6 +184,26 @@ namespace Tango.SharedUI.Controls
 
         #region Properties
 
+
+
+        public object SelectedObject
+        {
+            get { return (object)GetValue(SelectedObjectProperty); }
+            set { SetValue(SelectedObjectProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for SelectedObject.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty SelectedObjectProperty =
+            DependencyProperty.Register("SelectedObject", typeof(object), typeof(NavigationControl), new PropertyMetadata(null, (d, e) => (d as NavigationControl).OnSelectedObjectChanged()));
+
+        private void OnSelectedObjectChanged()
+        {
+            if (SelectedObject != null)
+            {
+                NavigateTo(SelectedObject);
+            }
+        }
+
         public ObservableCollection<FrameworkElement> Elements
         {
             get { return (ObservableCollection<FrameworkElement>)GetValue(ElementsProperty); }
@@ -623,6 +643,11 @@ namespace Tango.SharedUI.Controls
             return NavigateTo(navigationName, null);
         }
 
+        public FrameworkElement NavigateTo(Object obj)
+        {
+            return NavigateTo(obj.ToString(), null);
+        }
+
         public FrameworkElement NavigateTo(String navigationName, Action onCompleted = null)
         {
             Action completed = null;