Skip to content

Commit a993848

Browse files
committed
Prepare for //build
1 parent cb39eb7 commit a993848

File tree

3 files changed

+26
-27
lines changed

3 files changed

+26
-27
lines changed

Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
2424
window.Show();
2525

2626
#pragma region ...
27-
//// Create a ContentSiteBridge and connect Island content into it.
28-
//auto compositor = winrt::Compositor();
29-
//auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
30-
//siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);
31-
//siteBridge.Show();
32-
33-
//auto island = winrt::DrawingIsland(compositor).Island();
34-
//siteBridge.Connect(island);
35-
36-
//// Move initial focus to the ContentIsland.
37-
//auto focusNavigationHost = winrt::InputFocusNavigationHost::GetForSiteBridge(siteBridge);
38-
//focusNavigationHost.NavigateFocus(winrt::FocusNavigationRequest::Create(
39-
// winrt::FocusNavigationReason::Programmatic));
27+
// Create a ContentSiteBridge and connect Island content into it.
28+
auto compositor = winrt::Compositor();
29+
auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
30+
siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);
31+
siteBridge.Show();
32+
33+
auto island = winrt::DrawingIsland(compositor).Island();
34+
siteBridge.Connect(island);
35+
36+
// Move initial focus to the ContentIsland.
37+
auto focusNavigationHost = winrt::InputFocusNavigationHost::GetForSiteBridge(siteBridge);
38+
focusNavigationHost.NavigateFocus(winrt::FocusNavigationRequest::Create(
39+
winrt::FocusNavigationReason::Programmatic));
4040
#pragma endregion
4141

4242
queue.RunEventLoop();

Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<Optimize>False</Optimize>
2727
</PropertyGroup>
2828

29+
<ItemGroup>
30+
<Compile Remove="DuckScenario.cs" />
31+
</ItemGroup>
32+
2933
<ItemGroup>
3034
<!-- Added CsWinRT reference to avoid WinMD error as a result of WinMD leaking via project reference. -->
3135
<PackageReference Include="CommunityToolkit.WinAppSDK.LottieWinRT" Version="8.0.230819-rc-LottieIsland.7.g92a87e1883" />

Samples/Islands/DrawingIsland/DrawingCsTestApp/Program.cs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,29 @@
2828

2929
#region ...
3030
// Create a ContentSiteBridge and connect Island content into it.
31-
//var compositor = new Compositor();
32-
//var siteBridge = DesktopChildSiteBridge.Create(compositor, window.Id);
33-
//siteBridge.ResizePolicy = ContentSizePolicy.ResizeContentToParentWindow;
34-
//siteBridge.Show();
31+
var compositor = new Compositor();
32+
var siteBridge = DesktopChildSiteBridge.Create(compositor, window.Id);
33+
siteBridge.ResizePolicy = ContentSizePolicy.ResizeContentToParentWindow;
34+
siteBridge.Show();
3535

36-
//var drawing = new DrawingIsland(compositor);
37-
//siteBridge.Connect(drawing.Island);
36+
var drawing = new DrawingIsland(compositor);
37+
siteBridge.Connect(drawing.Island);
3838

3939
#region ...
4040
//var lottie = LottieIslandScenario.CreateLottieIsland(compositor);
4141
//siteBridge.Connect(lottie.Island);
4242

43-
#region ...
44-
//var island = DuckScenario.CreateIsland(compositor);
45-
//siteBridge.Connect(island);
46-
4743
#region ...
4844
//var island = HelmetScenario.CreateIsland(compositor);
4945
//siteBridge.Connect(island);
50-
#endregion
5146

5247
#endregion
5348
#endregion
5449

5550
// Move initial focus to the ContentIsland.
56-
//var focusNavigationHost = InputFocusNavigationHost.GetForSiteBridge(siteBridge);
57-
//focusNavigationHost.NavigateFocus(FocusNavigationRequest.Create(
58-
// FocusNavigationReason.Programmatic));
51+
var focusNavigationHost = InputFocusNavigationHost.GetForSiteBridge(siteBridge);
52+
focusNavigationHost.NavigateFocus(FocusNavigationRequest.Create(
53+
FocusNavigationReason.Programmatic));
5954
#endregion
6055

6156
queue.RunEventLoop();

0 commit comments

Comments
 (0)