Skip to content

Commit aa5e2a1

Browse files
authored
Optimized home page identifying (#804)
1 parent 8cb3fd5 commit aa5e2a1

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

Files/BaseLayout.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
182182
{
183183
App.CurrentInstance.NavigationToolbar.CanNavigateToParent = true;
184184
}
185+
App.InteractionViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
185186

186187
await App.CurrentInstance.ViewModel.RefreshItems();
187188

Files/UserControls/ModernSidebar.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ private void Sidebar_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
117117
App.CurrentInstance.ContentFrame.Navigate(typeof(PhotoAlbum), NavigationPath, new SuppressNavigationTransitionInfo());
118118
}
119119

120-
App.InteractionViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
121-
122120
App.CurrentInstance.NavigationToolbar.PathControlDisplayText = App.CurrentInstance.ViewModel.WorkingDirectory;
123121
}
124122

Files/UserControls/YourHome.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ private void OpenFileLocation_Click(object sender, RoutedEventArgs e)
4444
protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
4545
{
4646
base.OnNavigatedTo(eventArgs);
47+
App.InteractionViewModel.IsPageTypeNotHome = false;
4748
var parameters = eventArgs.Parameter.ToString();
4849
Locations.ItemLoader.itemsAdded.Clear();
4950
Locations.ItemLoader.DisplayItems();
@@ -127,8 +128,6 @@ private void Button_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEven
127128
App.CurrentInstance.ContentFrame.Navigate(typeof(PhotoAlbum), NavigationPath); // Grid View
128129
break;
129130
}
130-
131-
App.InteractionViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
132131
}
133132

134133
public static StorageFile RecentsFile;

Files/Views/Pages/ModernShellPage.xaml.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ private void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs e)
168168
{
169169
if (ItemDisplayFrame.CurrentSourcePageType == typeof(GenericFileBrowser))
170170
{
171-
App.InteractionViewModel.IsPageTypeNotHome = true;
172171
// Reset DataGrid Rows that may be in "cut" command mode
173172
IEnumerable items = (ItemDisplayFrame.Content as GenericFileBrowser).AllView.ItemsSource;
174173
if (items == null)
@@ -182,7 +181,6 @@ private void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs e)
182181
}
183182
else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
184183
{
185-
App.InteractionViewModel.IsPageTypeNotHome = true;
186184
// Reset Photo Grid items that may be in "cut" command mode
187185
foreach (ListedItem listedItem in (ItemDisplayFrame.Content as PhotoAlbum).FileList.Items)
188186
{
@@ -195,10 +193,6 @@ private void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs e)
195193
imageOfItem.Opacity = 1;
196194
}
197195
}
198-
else if (App.CurrentInstance.CurrentPageType == typeof(YourHome))
199-
{
200-
App.InteractionViewModel.IsPageTypeNotHome = false;
201-
}
202196
}
203197

204198
public void UpdateProgressFlyout(InteractionOperationType operationType, int amountComplete, int amountTotal)

0 commit comments

Comments
 (0)