Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 8 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
index 879401c1b..cefdbbfd6 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
@@ -252,7 +252,13 @@ namespace Tango.SharedUI.Controls
         public static readonly DependencyProperty KeepElementsAttachedProperty =
             DependencyProperty.Register("KeepElementsAttached", typeof(bool), typeof(NavigationControl), new PropertyMetadata(false));
 
-
+        public bool GalleryMode
+        {
+            get { return (bool)GetValue(GalleryModeProperty); }
+            set { SetValue(GalleryModeProperty, value); }
+        }
+        public static readonly DependencyProperty GalleryModeProperty =
+            DependencyProperty.Register("GalleryMode", typeof(bool), typeof(NavigationControl), new PropertyMetadata(false));
 
         public int SelectedIndex
         {
@@ -551,7 +557,7 @@ namespace Tango.SharedUI.Controls
                                     break;
                                 case TransitionTypes.Slide:
 
-                                    if (toIndex > fromIndex)
+                                    if (toIndex > fromIndex || GalleryMode)
                                     {
                                         fromAnimation.From = 0;
                                         fromAnimation.To = -ActualWidth;