Skip to content
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

WebView2 should cache input state #7575

Merged
merged 1 commit into from
Aug 11, 2022
Merged

WebView2 should cache input state #7575

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
53 changes: 40 additions & 13 deletions dev/WebView2/WebView2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,31 @@ void WebView2::HandlePointerPressed(const winrt::Windows::Foundation::IInspectab
m_hasMouseCapture = this->CapturePointer(args.Pointer());

winrt::PointerPointProperties properties{ pointerPoint.Properties() };
auto updateKind = properties.PointerUpdateKind();

if (updateKind == winrt::PointerUpdateKind::LeftButtonPressed)
if (properties.IsLeftButtonPressed())
{
// Double Click is working as well with this code, presumably by being recognized on browser side from WM_LBUTTONDOWN/ WM_LBUTTONUP
message = WM_LBUTTONDOWN;
m_isLeftMouseButtonPressed = true;
}
else if (updateKind == winrt::PointerUpdateKind::MiddleButtonPressed)
else if (properties.IsMiddleButtonPressed())
{
message = WM_MBUTTONDOWN;
m_isMiddleMouseButtonPressed = true;
}
else if (updateKind == winrt::PointerUpdateKind::RightButtonPressed)
else if (properties.IsRightButtonPressed())
{
message = WM_RBUTTONDOWN;
m_isRightMouseButtonPressed = true;
}
else if (properties.IsXButton1Pressed())
{
message = WM_XBUTTONDOWN;
m_isXButton1Pressed = true;
}
else if (updateKind == winrt::PointerUpdateKind::XButton1Pressed
|| updateKind == winrt::PointerUpdateKind::XButton2Pressed)
else if (properties.IsXButton2Pressed())
{
message = WM_XBUTTONDOWN;
m_isXButton2Pressed = true;
}
else
{
Expand Down Expand Up @@ -250,23 +256,30 @@ void WebView2::HandlePointerReleased(const winrt::Windows::Foundation::IInspecta

if (deviceType == winrt::PointerDeviceType::Mouse)
{
auto updateKind = properties.PointerUpdateKind();
if (updateKind == winrt::PointerUpdateKind::LeftButtonReleased)
if (m_isLeftMouseButtonPressed)
{
message = WM_LBUTTONUP;
m_isLeftMouseButtonPressed = false;
}
else if (updateKind == winrt::PointerUpdateKind::MiddleButtonReleased)
else if (m_isMiddleMouseButtonPressed)
{
message = WM_MBUTTONUP;
m_isMiddleMouseButtonPressed = false;
}
else if (updateKind == winrt::PointerUpdateKind::RightButtonReleased)
else if (m_isRightMouseButtonPressed)
{
message = WM_RBUTTONUP;
m_isRightMouseButtonPressed = false;
}
else if (m_isXButton1Pressed)
{
message = WM_XBUTTONUP;
m_isXButton1Pressed = false;
}
else if (updateKind == winrt::PointerUpdateKind::XButton1Released
|| updateKind == winrt::PointerUpdateKind::XButton2Released)
else if (m_isXButton2Pressed)
{
message = WM_XBUTTONUP;
m_isXButton2Pressed = false;
}
else
{
Expand Down Expand Up @@ -335,6 +348,10 @@ void WebView2::HandlePointerExited(const winrt::Windows::Foundation::IInspectabl
if (deviceType == winrt::PointerDeviceType::Mouse)
{
message = WM_MOUSELEAVE;
if (!m_hasMouseCapture)
{
ResetMouseInputState();
}
}
else
{
Expand Down Expand Up @@ -376,6 +393,7 @@ void WebView2::ResetPointerHelper(const winrt::PointerRoutedEventArgs& args)
if (deviceType == winrt::PointerDeviceType::Mouse)
{
m_hasMouseCapture = false;
ResetMouseInputState();
}
else if (deviceType == winrt::PointerDeviceType::Touch)
{
Expand Down Expand Up @@ -1164,6 +1182,15 @@ winrt::float4x4 WebView2::GetMatrixFromTransform() {
return outputMatrix;
}

void WebView2::ResetMouseInputState()
{
m_isLeftMouseButtonPressed = false;
m_isMiddleMouseButtonPressed = false;
m_isRightMouseButtonPressed = false;
m_isXButton1Pressed = false;
m_isXButton2Pressed = false;
}

void WebView2::FireNavigationStarting(const winrt::CoreWebView2NavigationStartingEventArgs& args)
{
// Fire new event on MUX side
Expand Down
1 change: 1 addition & 0 deletions dev/WebView2/WebView2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class WebView2 :
void FillPointerInfo(const winrt::PointerPoint& inputPt, winrt::CoreWebView2PointerInfo outputPt, const winrt::PointerRoutedEventArgs& args);

winrt::float4x4 GetMatrixFromTransform();
void ResetMouseInputState();
void OnManipulationModePropertyChanged(const winrt::DependencyObject& /*sender*/, const winrt::DependencyProperty& /*args*/);
void OnVisibilityPropertyChanged(const winrt::DependencyObject& /*sender*/, const winrt::DependencyProperty& /*args*/);

Expand Down