Skip to content

remove GetBridgeWindow static variable #15

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

Open
asklar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove GetBridgeWindow static variable #15

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Unpackaged.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>Unpackaged</id>
<version>0.0.16</version>
<version>0.0.17</version>
<authors>Alexander Sklar</authors>
<owners>Alexander Sklar</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
10 changes: 5 additions & 5 deletions inc/cppxaml/XamlWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@ namespace cppxaml {
return (int)msg.wParam;
}

mutable HWND m_hWndXamlIsland{ nullptr };
HWND GetBridgeWindow() const {
static HWND hWndXamlIsland = nullptr;
if (!hWndXamlIsland) {
if (!m_hWndXamlIsland) {
auto interop = m_desktopXamlSource.as<IDesktopWindowXamlSourceNative>();
winrt::check_hresult(interop->get_WindowHandle(&hWndXamlIsland));
winrt::check_hresult(interop->get_WindowHandle(&m_hWndXamlIsland));
}
return hWndXamlIsland;
return m_hWndXamlIsland;
}

LRESULT WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
Expand All @@ -298,7 +298,7 @@ namespace cppxaml {
auto createStruct = reinterpret_cast<LPCREATESTRUCT>(lParam);

// Parent the DesktopWindowXamlSource object to the current window.
winrt::check_hresult(interop->AttachToWindow(m_hWnd)); // This fails due to access violation!
winrt::check_hresult(interop->AttachToWindow(m_hWnd));

this->m_ui = this->m_getUI(*this);
if (m_controller && m_controller->OnUICreated) {
Expand Down