From 4f69b5cdcc4f045d4e31fc07f5d2ba9cb4ff1322 Mon Sep 17 00:00:00 2001 From: bg45 Date: Sat, 2 Dec 2017 08:42:10 -0500 Subject: [PATCH] Minor code refactor --- ModernKeePass/Pages/MainPage.xaml | 2 +- ModernKeePass/Pages/MainPage.xaml.cs | 4 ++-- ModernKeePass/Pages/SettingsPage.xaml | 2 +- ModernKeePass/Pages/SettingsPage.xaml.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ModernKeePass/Pages/MainPage.xaml b/ModernKeePass/Pages/MainPage.xaml index 9f01e41..1954123 100644 --- a/ModernKeePass/Pages/MainPage.xaml +++ b/ModernKeePass/Pages/MainPage.xaml @@ -61,7 +61,7 @@ Grid.Column="0" Grid.Row="1" x:Name="MenuListView" - SelectionChanged="MenuListView_SelectionChanged" + SelectionChanged="ListView_SelectionChanged" Background="{ThemeResource AppBarBackgroundThemeBrush}" ItemsSource="{Binding Source={StaticResource MenuItemsSource}}" SelectedItem="{Binding SelectedItem, Mode=TwoWay}" diff --git a/ModernKeePass/Pages/MainPage.xaml.cs b/ModernKeePass/Pages/MainPage.xaml.cs index b9454f1..71bf2a5 100644 --- a/ModernKeePass/Pages/MainPage.xaml.cs +++ b/ModernKeePass/Pages/MainPage.xaml.cs @@ -20,9 +20,9 @@ namespace ModernKeePass.Pages ListViewSource = MenuItemsSource; } - private void MenuListView_SelectionChanged(object sender, SelectionChangedEventArgs e) + private new void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e) { - ListView_SelectionChanged(sender, e); + base.ListView_SelectionChanged(sender, e); var selectedItem = Model.SelectedItem as MainMenuItemVm; if (selectedItem == null) MenuFrame.Navigate(typeof(WelcomePage)); else selectedItem.Destination.Navigate(selectedItem.PageType, selectedItem.Parameter); diff --git a/ModernKeePass/Pages/SettingsPage.xaml b/ModernKeePass/Pages/SettingsPage.xaml index 6802abc..8be4703 100644 --- a/ModernKeePass/Pages/SettingsPage.xaml +++ b/ModernKeePass/Pages/SettingsPage.xaml @@ -55,7 +55,7 @@ Grid.Column="0" Grid.Row="1" x:Name="MenuListView" - SelectionChanged="MenuListView_SelectionChanged" + SelectionChanged="ListView_SelectionChanged" Background="{ThemeResource AppBarBackgroundThemeBrush}" ItemsSource="{Binding Source={StaticResource MenuItemsSource}}" SelectedItem="{Binding SelectedItem, Mode=TwoWay}" diff --git a/ModernKeePass/Pages/SettingsPage.xaml.cs b/ModernKeePass/Pages/SettingsPage.xaml.cs index a968f47..97bcffe 100644 --- a/ModernKeePass/Pages/SettingsPage.xaml.cs +++ b/ModernKeePass/Pages/SettingsPage.xaml.cs @@ -21,9 +21,9 @@ namespace ModernKeePass.Pages ListViewSource = MenuItemsSource; } - private void MenuListView_SelectionChanged(object sender, SelectionChangedEventArgs e) + private new void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e) { - ListView_SelectionChanged(sender, e); + base.ListView_SelectionChanged(sender, e); var selectedItem = Model.SelectedItem as ListMenuItemVm; MenuFrame?.Navigate(selectedItem == null ? typeof(SettingsWelcomePage) : selectedItem.PageType); }