From fab21191e2112c9117eab90d4e83afdad9f1364c Mon Sep 17 00:00:00 2001 From: cheezwhines <49319688+cheezwhines@users.noreply.github.com> Date: Fri, 19 Apr 2019 21:59:10 -0400 Subject: [PATCH] Clicking on the same element in the hamburger view should re-open that view, like the menu items do (#447) Fixes #437. Clicking on the same element in the hamburger view should re-open that view, like the menu items do Description of the changes: -Fixed the bug that was listed How changes were validated: -manual --- src/Calculator/Views/MainPage.xaml | 1 + src/Calculator/Views/MainPage.xaml.cpp | 5 +++++ src/Calculator/Views/MainPage.xaml.h | 1 + 3 files changed, 7 insertions(+) diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml index 6f719aa8..967c8e69 100644 --- a/src/Calculator/Views/MainPage.xaml +++ b/src/Calculator/Views/MainPage.xaml @@ -100,6 +100,7 @@ PaneOpened="OnNavPaneOpened" PaneOpening="OnNavPaneOpening" SelectionChanged="OnNavSelectionChanged" + ItemInvoked="OnNavItemInvoked" TabIndex="1" UseSystemFocusVisuals="True"> diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp index 34dc4afc..337cc997 100644 --- a/src/Calculator/Views/MainPage.xaml.cpp +++ b/src/Calculator/Views/MainPage.xaml.cpp @@ -524,3 +524,8 @@ void MainPage::AnnounceCategoryName() NarratorAnnouncement^ announcement = CalculatorAnnouncement::GetCategoryNameChangedAnnouncement(categoryName); NarratorNotifier->Announce(announcement); } + +void MainPage::OnNavItemInvoked(MUXC::NavigationView^ /*sender*/, _In_ MUXC::NavigationViewItemInvokedEventArgs^ e) +{ + NavView->IsPaneOpen = false; +} diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h index f95da83e..a660d260 100644 --- a/src/Calculator/Views/MainPage.xaml.h +++ b/src/Calculator/Views/MainPage.xaml.h @@ -49,6 +49,7 @@ namespace CalculatorApp void OnNavPaneOpened(_In_ Microsoft::UI::Xaml::Controls::NavigationView^ sender, _In_ Platform::Object^ args); void OnNavPaneClosed(_In_ Microsoft::UI::Xaml::Controls::NavigationView^ sender, _In_ Platform::Object^ args); void OnNavSelectionChanged(_In_ Platform::Object^ sender, _In_ Microsoft::UI::Xaml::Controls::NavigationViewSelectionChangedEventArgs^ e); + void OnNavItemInvoked(Microsoft::UI::Xaml::Controls::NavigationView^ /*sender*/, _In_ Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs^ e); void OnAboutButtonClick(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::Controls::ItemClickEventArgs^ e); void OnAboutFlyoutOpened(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);