diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-29 17:02:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-29 17:02:53 +0200 |
| commit | 8c4783919b1955c08c9e7107a2e58a1501c4fdad (patch) | |
| tree | c650c55e20f4833329e4e5061e950da773a69189 /widget | |
| parent | 32c067857c532bf651e5e6946ec1a67772eb2252 (diff) | |
| parent | 80f9b75efa08ea449937298b791ff278cbf5fa22 (diff) | |
| download | uxp-8c4783919b1955c08c9e7107a2e58a1501c4fdad.tar.gz | |
Merge pull request #295 from janekptacijarabaci/_native_52ESR_events_auxclick_1
UI Events - implement auxclick
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/BasicEvents.h | 1 | ||||
| -rw-r--r-- | widget/EventMessageList.h | 1 | ||||
| -rw-r--r-- | widget/WidgetEventImpl.cpp | 1 | ||||
| -rw-r--r-- | widget/nsBaseWidget.cpp | 1 | ||||
| -rw-r--r-- | widget/windows/WinUtils.cpp | 3 |
5 files changed, 6 insertions, 1 deletions
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h index da8d819ef4..a6228f179f 100644 --- a/widget/BasicEvents.h +++ b/widget/BasicEvents.h @@ -585,6 +585,7 @@ public: case eMouseEventClass: mFlags.mComposed = mMessage == eMouseClick || mMessage == eMouseDoubleClick || + mMessage == eMouseAuxClick || mMessage == eMouseDown || mMessage == eMouseUp || mMessage == eMouseEnter || mMessage == eMouseLeave || mMessage == eMouseOver || mMessage == eMouseOut || diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 7fe642637e..f6cf76209b 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -84,6 +84,7 @@ NS_EVENT_MESSAGE(eMouseEnterIntoWidget) NS_EVENT_MESSAGE(eMouseExitFromWidget) NS_EVENT_MESSAGE(eMouseDoubleClick) NS_EVENT_MESSAGE(eMouseClick) +NS_EVENT_MESSAGE(eMouseAuxClick) // eMouseActivate is fired when the widget is activated by a click. NS_EVENT_MESSAGE(eMouseActivate) NS_EVENT_MESSAGE(eMouseOver) diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp index 52e2b9b40e..7dd292cb0d 100644 --- a/widget/WidgetEventImpl.cpp +++ b/widget/WidgetEventImpl.cpp @@ -236,6 +236,7 @@ WidgetEvent::HasMouseEventMessage() const case eMouseUp: case eMouseClick: case eMouseDoubleClick: + case eMouseAuxClick: case eMouseEnterIntoWidget: case eMouseExitFromWidget: case eMouseActivate: diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp index b820fed3cc..909660f715 100644 --- a/widget/nsBaseWidget.cpp +++ b/widget/nsBaseWidget.cpp @@ -3086,6 +3086,7 @@ case _value: eventName.AssignLiteral(_name) ; break _ASSIGN_eventName(eMouseDown,"eMouseDown"); _ASSIGN_eventName(eMouseUp,"eMouseUp"); _ASSIGN_eventName(eMouseClick,"eMouseClick"); + _ASSIGN_eventName(eMouseAuxClick,"eMouseAuxClick"); _ASSIGN_eventName(eMouseDoubleClick,"eMouseDoubleClick"); _ASSIGN_eventName(eMouseMove,"eMouseMove"); _ASSIGN_eventName(eLoad,"eLoad"); diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp index 0a57ad4393..bd42e78f66 100644 --- a/widget/windows/WinUtils.cpp +++ b/widget/windows/WinUtils.cpp @@ -1138,7 +1138,8 @@ WinUtils::GetIsMouseFromTouch(EventMessage aEventMessage) const uint32_t MOZ_T_I_SIGNATURE = TABLET_INK_TOUCH | TABLET_INK_SIGNATURE; const uint32_t MOZ_T_I_CHECK_TCH = TABLET_INK_TOUCH | TABLET_INK_CHECK; return ((aEventMessage == eMouseMove || aEventMessage == eMouseDown || - aEventMessage == eMouseUp || aEventMessage == eMouseDoubleClick) && + aEventMessage == eMouseUp || aEventMessage == eMouseAuxClick || + aEventMessage == eMouseDoubleClick) && (GetMessageExtraInfo() & MOZ_T_I_SIGNATURE) == MOZ_T_I_CHECK_TCH); } |