mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Minor code refactor
This commit is contained in:
@@ -61,7 +61,7 @@
|
|||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
x:Name="MenuListView"
|
x:Name="MenuListView"
|
||||||
SelectionChanged="MenuListView_SelectionChanged"
|
SelectionChanged="ListView_SelectionChanged"
|
||||||
Background="{ThemeResource AppBarBackgroundThemeBrush}"
|
Background="{ThemeResource AppBarBackgroundThemeBrush}"
|
||||||
ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
|
ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
|
||||||
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
|
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
|
||||||
|
@@ -20,9 +20,9 @@ namespace ModernKeePass.Pages
|
|||||||
ListViewSource = MenuItemsSource;
|
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;
|
var selectedItem = Model.SelectedItem as MainMenuItemVm;
|
||||||
if (selectedItem == null) MenuFrame.Navigate(typeof(WelcomePage));
|
if (selectedItem == null) MenuFrame.Navigate(typeof(WelcomePage));
|
||||||
else selectedItem.Destination.Navigate(selectedItem.PageType, selectedItem.Parameter);
|
else selectedItem.Destination.Navigate(selectedItem.PageType, selectedItem.Parameter);
|
||||||
|
@@ -55,7 +55,7 @@
|
|||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
x:Name="MenuListView"
|
x:Name="MenuListView"
|
||||||
SelectionChanged="MenuListView_SelectionChanged"
|
SelectionChanged="ListView_SelectionChanged"
|
||||||
Background="{ThemeResource AppBarBackgroundThemeBrush}"
|
Background="{ThemeResource AppBarBackgroundThemeBrush}"
|
||||||
ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
|
ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
|
||||||
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
|
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
|
||||||
|
@@ -21,9 +21,9 @@ namespace ModernKeePass.Pages
|
|||||||
ListViewSource = MenuItemsSource;
|
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;
|
var selectedItem = Model.SelectedItem as ListMenuItemVm;
|
||||||
MenuFrame?.Navigate(selectedItem == null ? typeof(SettingsWelcomePage) : selectedItem.PageType);
|
MenuFrame?.Navigate(selectedItem == null ? typeof(SettingsWelcomePage) : selectedItem.PageType);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user