Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win10 uwp fix for new Mouse events (#17434)

This commit is contained in:
Dale Stammen 2017-03-02 20:40:32 -08:00 committed by James Chen
parent c69d14c32e
commit 13a438dbfd
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos/platform/winrt/CCGLViewImpl-winrt.cpp
View File

@ -88,7 +88,7 @@ GLViewImpl::GLViewImpl()
, m_height(0) , m_height(0)
, m_orientation(DisplayOrientations::Landscape) , m_orientation(DisplayOrientations::Landscape)
, m_appShouldExit(false) , m_appShouldExit(false)
, _lastMouseButtonPressed(MouseButton::None) , _lastMouseButtonPressed(EventMouse::MouseButton::BUTTON_UNSET)
{ {
s_pEglView = this; s_pEglView = this;
_viewName = "cocos2dx"; _viewName = "cocos2dx";
@ -334,7 +334,7 @@ void cocos2d::GLViewImpl::OnMousePressed(Windows::UI::Core::PointerEventArgs^ ar
handleTouchesBegin(1, &id, &pt.x, &pt.y); handleTouchesBegin(1, &id, &pt.x, &pt.y);
} }
if (_lastMouseButtonPressed != MouseButton::None) if (_lastMouseButtonPressed != EventMouse::MouseButton::BUTTON_UNSET)
{ {
EventMouse event(EventMouse::MouseEventType::MOUSE_UP); EventMouse event(EventMouse::MouseEventType::MOUSE_UP);
@ -347,15 +347,15 @@ void cocos2d::GLViewImpl::OnMousePressed(Windows::UI::Core::PointerEventArgs^ ar
// Set current button // Set current button
if (args->CurrentPoint->Properties->IsLeftButtonPressed) if (args->CurrentPoint->Properties->IsLeftButtonPressed)
{ {
_lastMouseButtonPressed = MouseButton::Left; _lastMouseButtonPressed = EventMouse::MouseButton::BUTTON_LEFT;
} }
else if (args->CurrentPoint->Properties->IsRightButtonPressed) else if (args->CurrentPoint->Properties->IsRightButtonPressed)
{ {
_lastMouseButtonPressed = MouseButton::Right; _lastMouseButtonPressed = EventMouse::MouseButton::BUTTON_RIGHT;
} }
else if (args->CurrentPoint->Properties->IsMiddleButtonPressed) else if (args->CurrentPoint->Properties->IsMiddleButtonPressed)
{ {
_lastMouseButtonPressed = MouseButton::Middle; _lastMouseButtonPressed = EventMouse::MouseButton::BUTTON_MIDDLE;
} }
event.setMouseButton(_lastMouseButtonPressed); event.setMouseButton(_lastMouseButtonPressed);
event.setCursorPosition(mousePosition.x, mousePosition.y); event.setCursorPosition(mousePosition.x, mousePosition.y);
@ -378,15 +378,15 @@ void cocos2d::GLViewImpl::OnMouseMoved(Windows::UI::Core::PointerEventArgs^ args
// Set current button // Set current button
if (args->CurrentPoint->Properties->IsLeftButtonPressed) if (args->CurrentPoint->Properties->IsLeftButtonPressed)
{ {
event.setMouseButton(MouseButton::Left); event.setMouseButton(EventMouse::MouseButton::BUTTON_LEFT);
} }
else if (args->CurrentPoint->Properties->IsRightButtonPressed) else if (args->CurrentPoint->Properties->IsRightButtonPressed)
{ {
event.setMouseButton(MouseButton::Right); event.setMouseButton(EventMouse::MouseButton::BUTTON_RIGHT);
} }
else if (args->CurrentPoint->Properties->IsMiddleButtonPressed) else if (args->CurrentPoint->Properties->IsMiddleButtonPressed)
{ {
event.setMouseButton(MouseButton::Middle); event.setMouseButton(EventMouse::MouseButton::BUTTON_MIDDLE);
} }
event.setCursorPosition(mousePosition.x, mousePosition.y); event.setCursorPosition(mousePosition.x, mousePosition.y);
Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
@ -397,7 +397,7 @@ void cocos2d::GLViewImpl::OnMouseReleased(Windows::UI::Core::PointerEventArgs^ a
Vec2 mousePosition = GetPointMouse(args); Vec2 mousePosition = GetPointMouse(args);
// Emulated touch, if left mouse button // Emulated touch, if left mouse button
if (_lastMouseButtonPressed == MouseButton::Left) if (_lastMouseButtonPressed == EventMouse::MouseButton::BUTTON_LEFT)
{ {
intptr_t id = 0; intptr_t id = 0;
Vec2 pt = GetPoint(args); Vec2 pt = GetPoint(args);
@ -410,7 +410,7 @@ void cocos2d::GLViewImpl::OnMouseReleased(Windows::UI::Core::PointerEventArgs^ a
event.setCursorPosition(mousePosition.x, mousePosition.y); event.setCursorPosition(mousePosition.x, mousePosition.y);
Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
_lastMouseButtonPressed = MouseButton::None; _lastMouseButtonPressed = EventMouse::MouseButton::BUTTON_UNSET;
} }
void cocos2d::GLViewImpl::OnMouseWheelChanged(Windows::UI::Core::PointerEventArgs^ args) void cocos2d::GLViewImpl::OnMouseWheelChanged(Windows::UI::Core::PointerEventArgs^ args)

2
cocos/platform/winrt/CCGLViewImpl-winrt.h
View File

@ -173,7 +173,7 @@ private:
bool m_windowClosed; bool m_windowClosed;
bool m_windowVisible; bool m_windowVisible;
// PointerReleased for mouse not send button id, need save in PointerPressed last button // PointerReleased for mouse not send button id, need save in PointerPressed last button
MouseButton _lastMouseButtonPressed; EventMouse::MouseButton _lastMouseButtonPressed;
bool m_running; bool m_running;
bool m_initialized; bool m_initialized;