Minor cleanup to align C++ and C# demos

Author: jeffstall

Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp

@@ -3,26 +3,14 @@
 
 #include "pch.h"
 
-namespace winrt
-{
-    using namespace Microsoft::UI::Composition;
-    using namespace Microsoft::UI::Content;
-    using namespace Microsoft::UI::Dispatching;
-    using namespace Microsoft::UI::Input;
-    using namespace Microsoft::UI::Windowing;
-
-    using namespace DrawingIslandComponents;
-}
-
 int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
     winrt::init_apartment(winrt::apartment_type::single_threaded);
 
     auto controller{ winrt::DispatcherQueueController::CreateOnCurrentThread() };
     auto queue = controller.DispatcherQueue();
 
-    // Associating the AppWindow with the DispatcherQueue on which the ContentIsland is created
-    // will ensure that the ContentIsland is Closed when the AppWindow closes.
+    // Associate the AppWindow's lifetime with the DispatcherQueue to automatically close on exit.
     auto window = winrt::AppWindow::Create();
     window.AssociateWithDispatcherQueue(queue);
     window.Closing(
@@ -35,20 +23,21 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
     window.Title(L"Drawing C++ TestApp");
     window.Show();
 
-    // Create the Island content in the window.
+#pragma region ...
+    // Create a ContentSiteBridge and connect Island content into it.
     auto compositor = winrt::Compositor();
-    auto island = winrt::DrawingIsland(compositor).Island();
-
-    // Create a ContentSiteBridge and connect the ContentIsland to it.
     auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
     siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);
     siteBridge.Show();
+
+    auto island = winrt::DrawingIsland(compositor).Island();
     siteBridge.Connect(island);
 
     // Move initial focus to the ContentIsland.
     auto focusNavigationHost = winrt::InputFocusNavigationHost::GetForSiteBridge(siteBridge);
     focusNavigationHost.NavigateFocus(winrt::FocusNavigationRequest::Create(
         winrt::FocusNavigationReason::Programmatic));
+#pragma endregion
 
     queue.RunEventLoop();
 

Samples/Islands/DrawingIsland/DrawingCppTestApp/pch.h

@@ -19,3 +19,14 @@
 #include <winrt/Microsoft.UI.Windowing.h>
 
 #include "winrt/DrawingIslandComponents.h"
+
+namespace winrt
+{
+    using namespace Microsoft::UI::Composition;
+    using namespace Microsoft::UI::Content;
+    using namespace Microsoft::UI::Dispatching;
+    using namespace Microsoft::UI::Input;
+    using namespace Microsoft::UI::Windowing;
+
+    using namespace DrawingIslandComponents;
+}

Samples/Islands/DrawingIsland/DrawingCsTestApp/Program.cs

@@ -14,22 +14,24 @@
 var controller = DispatcherQueueController.CreateOnCurrentThread();
 var queue = controller.DispatcherQueue;
 
+// Associate the AppWindow's lifetime with the DispatcherQueue to automatically close on exit.
 var window = AppWindow.Create();
 window.AssociateWithDispatcherQueue(queue);
 window.Closing +=(sender, args) =>
     {
+        // Ensure the DispatcherQueue exits the event loop on close.
         queue.EnqueueEventLoopExit();
     };
 
 window.Title = "Drawing C# .NET TestApp";
 window.Show();
 
 #region ...
-//var compositor = new Compositor();
-
-//var siteBridge = DesktopChildSiteBridge.Create(compositor, window.Id);
-//siteBridge.ResizePolicy = ContentSizePolicy.ResizeContentToParentWindow;
-//siteBridge.Show();
+// Create a ContentSiteBridge and connect Island content into it.
+var compositor = new Compositor();
+var siteBridge = DesktopChildSiteBridge.Create(compositor, window.Id);
+siteBridge.ResizePolicy = ContentSizePolicy.ResizeContentToParentWindow;
+siteBridge.Show();
 
 //var drawing = new DrawingIsland(compositor);
 //siteBridge.Connect(drawing.Island);
@@ -43,16 +45,17 @@
 //siteBridge.Connect(island);
 
 #region ...
-//var island = HelmetScenario.CreateIsland(compositor);
-//siteBridge.Connect(island);
+var island = HelmetScenario.CreateIsland(compositor);
+siteBridge.Connect(island);
 #endregion
 
 #endregion
 #endregion
 
-//var focusNavigationHost = InputFocusNavigationHost.GetForSiteBridge(siteBridge);
-//focusNavigationHost.NavigateFocus(FocusNavigationRequest.Create(
-//    FocusNavigationReason.Programmatic));
+// Move initial focus to the ContentIsland.
+var focusNavigationHost = InputFocusNavigationHost.GetForSiteBridge(siteBridge);
+focusNavigationHost.NavigateFocus(FocusNavigationRequest.Create(
+    FocusNavigationReason.Programmatic));
 #endregion
 
 queue.RunEventLoop();