Skip to content

Add proper island cleanup flow to DrawingIsland sample app #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2024
Merged

Add proper island cleanup flow to DrawingIsland sample app #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,25 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
auto controller{ winrt::DispatcherQueueController::CreateOnCurrentThread() };
auto queue = controller.DispatcherQueue();

auto compositor = winrt::Compositor();
auto island = winrt::DrawingIsland(compositor).Island();

auto window = winrt::AppWindow::Create();
window.AssociateWithDispatcherQueue(queue);
window.Closing([&](auto&&, auto&&)
window.Closing(
[island, queue](auto&&, auto&&)
{
island.Close();
queue.EnqueueEventLoopExit();
});

window.Title(L"Drawing C++ TestApp");
window.Show();

auto compositor = winrt::Compositor();
auto drawing = winrt::DrawingIsland(compositor);

auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);
siteBridge.Show();
siteBridge.Connect(drawing.Island());
siteBridge.Connect(island);

// Move initial focus to the island.
auto focusNavigationHost = winrt::InputFocusNavigationHost::GetForSiteBridge(siteBridge);
Expand Down