Ensure Up Navigation Uses Current Layout

lukeblevins · lukeblevins · commit 2130b2d2031e · 2019-12-30T13:02:31.000-05:00
diff --git a/Files/NavigationActions.cs b/Files/NavigationActions.cs
@@ -69,12 +69,12 @@ public static void Up_Click(object sender, RoutedEventArgs e)
             }
 
             SelectSidebarItemFromPath(parentDirectoryOfPath, null);
-            instanceContentFrame.Navigate(typeof(PhotoAlbum), parentDirectoryOfPath, new SuppressNavigationTransitionInfo());
+            instanceContentFrame.Navigate(App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType, parentDirectoryOfPath, new SuppressNavigationTransitionInfo());
         }
 
-        private static void SelectSidebarItemFromPath(string Parameter, Type previousSourcePageType)
+        private static void SelectSidebarItemFromPath(string Parameter, Type incomingSourcePageType)
         {
-            if (previousSourcePageType == typeof(YourHome) && previousSourcePageType != null)
+            if (incomingSourcePageType == typeof(YourHome) && incomingSourcePageType != null)
             {
                 App.OccupiedInstance.LocationsList.SelectedItem = App.sideBarItems.First(x => (x as SidebarItem) == App.sideBarItems[0]);
                 App.OccupiedInstance.PathText.Text = "New tab";

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,12 @@ public static void Up_Click(object sender, RoutedEventArgs e)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`SelectSidebarItemFromPath(parentDirectoryOfPath, null);`
`72`		`- instanceContentFrame.Navigate(typeof(PhotoAlbum), parentDirectoryOfPath, new SuppressNavigationTransitionInfo());`
	`72`	`+ instanceContentFrame.Navigate(App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType, parentDirectoryOfPath, new SuppressNavigationTransitionInfo());`
`73`	`73`	`}`
`74`	`74`
`75`		`- private static void SelectSidebarItemFromPath(string Parameter, Type previousSourcePageType)`
	`75`	`+ private static void SelectSidebarItemFromPath(string Parameter, Type incomingSourcePageType)`
`76`	`76`	`{`
`77`		`- if (previousSourcePageType == typeof(YourHome) && previousSourcePageType != null)`
	`77`	`+ if (incomingSourcePageType == typeof(YourHome) && incomingSourcePageType != null)`
`78`	`78`	`{`
`79`	`79`	`App.OccupiedInstance.LocationsList.SelectedItem = App.sideBarItems.First(x => (x as SidebarItem) == App.sideBarItems[0]);`
`80`	`80`	`App.OccupiedInstance.PathText.Text = "New tab";`