diff options
Diffstat (limited to 'Tests/VSXaml')
-rw-r--r-- | Tests/VSXaml/App.xaml.cpp | 127 | ||||
-rw-r--r-- | Tests/VSXaml/App.xaml.h | 32 | ||||
-rw-r--r-- | Tests/VSXaml/MainPage.xaml.cpp | 5 | ||||
-rw-r--r-- | Tests/VSXaml/MainPage.xaml.h | 19 |
4 files changed, 95 insertions, 88 deletions
diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp index a187ed56ef..549b7ef28a 100644 --- a/Tests/VSXaml/App.xaml.cpp +++ b/Tests/VSXaml/App.xaml.cpp @@ -23,7 +23,8 @@ using namespace Windows::UI::Xaml::Interop; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 +// The Blank Application template is documented at +// http://go.microsoft.com/fwlink/?LinkId=234227 /// <summary> /// Initializes the singleton application object. This is the first line of @@ -32,8 +33,8 @@ using namespace Windows::UI::Xaml::Navigation; /// </summary> App::App() { - InitializeComponent(); - Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); + InitializeComponent(); + Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); } /// <summary> @@ -42,64 +43,63 @@ App::App() /// launched to open a specific file. /// </summary> /// <param name="e">Details about the launch request and process.</param> -void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) +void App::OnLaunched( + Windows::ApplicationModel::Activation::LaunchActivatedEventArgs ^ e) { #if _DEBUG - // Show graphics profiling information while debugging. - if (IsDebuggerPresent()) - { - // Display the current frame rate counters - DebugSettings->EnableFrameRateCounter = true; - } + // Show graphics profiling information while debugging. + if (IsDebuggerPresent()) { + // Display the current frame rate counters + DebugSettings->EnableFrameRateCounter = true; + } #endif - auto rootFrame = dynamic_cast<Frame^>(Window::Current->Content); - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == nullptr) - { - // Create a Frame to act as the navigation context and associate it with - // a SuspensionManager key - rootFrame = ref new Frame(); - - // Set the default language - rootFrame->Language = Windows::Globalization::ApplicationLanguages::Languages->GetAt(0); - - rootFrame->NavigationFailed += ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed); - - if (e->PreviousExecutionState == ApplicationExecutionState::Terminated) - { - // TODO: Restore the saved session state only when appropriate, scheduling the - // final launch steps after the restore is complete - - } - - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); - } - // Place the frame in the current Window - Window::Current->Content = rootFrame; - // Ensure the current window is active - Window::Current->Activate(); - } - else - { - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); - } - // Ensure the current window is active - Window::Current->Activate(); - } + auto rootFrame = dynamic_cast<Frame ^>(Window::Current->Content); + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == nullptr) { + // Create a Frame to act as the navigation context and associate it with + // a SuspensionManager key + rootFrame = ref new Frame(); + + // Set the default language + rootFrame->Language = + Windows::Globalization::ApplicationLanguages::Languages->GetAt(0); + + rootFrame->NavigationFailed += + ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler( + this, &App::OnNavigationFailed); + + if (e->PreviousExecutionState == ApplicationExecutionState::Terminated) { + // TODO: Restore the saved session state only when appropriate, + // scheduling the + // final launch steps after the restore is complete + } + + if (rootFrame->Content == nullptr) { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a + // navigation + // parameter + rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); + } + // Place the frame in the current Window + Window::Current->Content = rootFrame; + // Ensure the current window is active + Window::Current->Activate(); + } else { + if (rootFrame->Content == nullptr) { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a + // navigation + // parameter + rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); + } + // Ensure the current window is active + Window::Current->Activate(); + } } /// <summary> @@ -109,12 +109,12 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent /// </summary> /// <param name="sender">The source of the suspend request.</param> /// <param name="e">Details about the suspend request.</param> -void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) +void App::OnSuspending(Object ^ sender, SuspendingEventArgs ^ e) { - (void) sender; // Unused parameter - (void) e; // Unused parameter + (void)sender; // Unused parameter + (void)e; // Unused parameter - //TODO: Save application state and stop any background activity + // TODO: Save application state and stop any background activity } /// <summary> @@ -122,7 +122,10 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) /// </summary> /// <param name="sender">The Frame which failed navigation</param> /// <param name="e">Details about the navigation failure</param> -void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e) +void App::OnNavigationFailed( + Platform::Object ^ sender, + Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^ e) { - throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name); + throw ref new FailureException("Failed to load Page " + + e->SourcePageType.Name); } diff --git a/Tests/VSXaml/App.xaml.h b/Tests/VSXaml/App.xaml.h index 1f65bdab99..d3711d065d 100644 --- a/Tests/VSXaml/App.xaml.h +++ b/Tests/VSXaml/App.xaml.h @@ -7,21 +7,25 @@ #include "App.g.h" -namespace VSXaml +namespace VSXaml { +/// <summary> +/// Provides application-specific behavior to supplement the default +/// Application class. +/// </summary> +ref class App sealed { - /// <summary> - /// Provides application-specific behavior to supplement the default Application class. - /// </summary> - ref class App sealed - { - protected: - virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override; +protected: + virtual void OnLaunched( + Windows::ApplicationModel::Activation::LaunchActivatedEventArgs ^ + e) override; - internal: - App(); + internal : App(); - private: - void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); - void OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e); - }; +private: + void OnSuspending(Platform::Object ^ sender, + Windows::ApplicationModel::SuspendingEventArgs ^ e); + void OnNavigationFailed( + Platform::Object ^ sender, + Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^ e); +}; } diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp index 63f2decf82..51da237706 100644 --- a/Tests/VSXaml/MainPage.xaml.cpp +++ b/Tests/VSXaml/MainPage.xaml.cpp @@ -20,9 +20,10 @@ using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 +// The Blank Page item template is documented at +// http://go.microsoft.com/fwlink/?LinkId=234238 MainPage::MainPage() { - InitializeComponent(); + InitializeComponent(); } diff --git a/Tests/VSXaml/MainPage.xaml.h b/Tests/VSXaml/MainPage.xaml.h index ccc781b8f7..875d227076 100644 --- a/Tests/VSXaml/MainPage.xaml.h +++ b/Tests/VSXaml/MainPage.xaml.h @@ -7,15 +7,14 @@ #include "MainPage.g.h" -namespace VSXaml +namespace VSXaml { +/// <summary> +/// An empty page that can be used on its own or navigated to within a Frame. +/// </summary> +public +ref class MainPage sealed { - /// <summary> - /// An empty page that can be used on its own or navigated to within a Frame. - /// </summary> - public ref class MainPage sealed - { - public: - MainPage(); - - }; +public: + MainPage(); +}; } |