mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 895274 part.262 Rename NS_SIMPLE_GESTURE_MAGNIFY_UPDATE to eMagnifyGestureUpdate r=smaug
This commit is contained in:
parent
82769d99ba
commit
70291bd76c
@ -1308,9 +1308,9 @@ nsDOMWindowUtils::SendSimpleGestureEvent(const nsAString& aType,
|
|||||||
msg = NS_SIMPLE_GESTURE_SWIPE;
|
msg = NS_SIMPLE_GESTURE_SWIPE;
|
||||||
else if (aType.EqualsLiteral("MozMagnifyGestureStart"))
|
else if (aType.EqualsLiteral("MozMagnifyGestureStart"))
|
||||||
msg = NS_SIMPLE_GESTURE_MAGNIFY_START;
|
msg = NS_SIMPLE_GESTURE_MAGNIFY_START;
|
||||||
else if (aType.EqualsLiteral("MozMagnifyGestureUpdate"))
|
else if (aType.EqualsLiteral("MozMagnifyGestureUpdate")) {
|
||||||
msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
|
msg = eMagnifyGestureUpdate;
|
||||||
else if (aType.EqualsLiteral("MozMagnifyGesture")) {
|
} else if (aType.EqualsLiteral("MozMagnifyGesture")) {
|
||||||
msg = eMagnifyGesture;
|
msg = eMagnifyGesture;
|
||||||
} else if (aType.EqualsLiteral("MozRotateGestureStart")) {
|
} else if (aType.EqualsLiteral("MozRotateGestureStart")) {
|
||||||
msg = eRotateGestureStart;
|
msg = eRotateGestureStart;
|
||||||
|
@ -872,7 +872,7 @@ NON_IDL_EVENT(MozMagnifyGestureStart,
|
|||||||
EventNameType_None,
|
EventNameType_None,
|
||||||
eSimpleGestureEventClass)
|
eSimpleGestureEventClass)
|
||||||
NON_IDL_EVENT(MozMagnifyGestureUpdate,
|
NON_IDL_EVENT(MozMagnifyGestureUpdate,
|
||||||
NS_SIMPLE_GESTURE_MAGNIFY_UPDATE,
|
eMagnifyGestureUpdate,
|
||||||
EventNameType_None,
|
EventNameType_None,
|
||||||
eSimpleGestureEventClass)
|
eSimpleGestureEventClass)
|
||||||
NON_IDL_EVENT(MozMagnifyGesture,
|
NON_IDL_EVENT(MozMagnifyGesture,
|
||||||
|
@ -278,7 +278,7 @@ NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_UPDATE, NS_SIMPLE_GESTURE_EVENT_START
|
|||||||
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_END, NS_SIMPLE_GESTURE_EVENT_START + 3)
|
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_END, NS_SIMPLE_GESTURE_EVENT_START + 3)
|
||||||
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE, NS_SIMPLE_GESTURE_EVENT_START + 4)
|
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE, NS_SIMPLE_GESTURE_EVENT_START + 4)
|
||||||
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_START, NS_SIMPLE_GESTURE_EVENT_START + 5)
|
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_START, NS_SIMPLE_GESTURE_EVENT_START + 5)
|
||||||
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_UPDATE, NS_SIMPLE_GESTURE_EVENT_START + 6)
|
NS_EVENT_MESSAGE(eMagnifyGestureUpdate, NS_SIMPLE_GESTURE_EVENT_START + 6)
|
||||||
NS_EVENT_MESSAGE(eMagnifyGesture, NS_SIMPLE_GESTURE_EVENT_START + 7)
|
NS_EVENT_MESSAGE(eMagnifyGesture, NS_SIMPLE_GESTURE_EVENT_START + 7)
|
||||||
NS_EVENT_MESSAGE(eRotateGestureStart, NS_SIMPLE_GESTURE_EVENT_START + 8)
|
NS_EVENT_MESSAGE(eRotateGestureStart, NS_SIMPLE_GESTURE_EVENT_START + 8)
|
||||||
NS_EVENT_MESSAGE(eRotateGestureUpdate, NS_SIMPLE_GESTURE_EVENT_START + 9)
|
NS_EVENT_MESSAGE(eRotateGestureUpdate, NS_SIMPLE_GESTURE_EVENT_START + 9)
|
||||||
|
@ -1131,7 +1131,7 @@ nsWindow::OnNativeGestureEvent(AndroidGeckoEvent *ae)
|
|||||||
mLastDist = delta;
|
mLastDist = delta;
|
||||||
break;
|
break;
|
||||||
case AndroidMotionEvent::ACTION_MAGNIFY:
|
case AndroidMotionEvent::ACTION_MAGNIFY:
|
||||||
msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
|
msg = eMagnifyGestureUpdate;
|
||||||
delta -= mLastDist;
|
delta -= mLastDist;
|
||||||
mLastDist += delta;
|
mLastDist += delta;
|
||||||
break;
|
break;
|
||||||
|
@ -4227,7 +4227,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case eGestureState_MagnifyGesture:
|
case eGestureState_MagnifyGesture:
|
||||||
msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
|
msg = eMagnifyGestureUpdate;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case eGestureState_None:
|
case eGestureState_None:
|
||||||
|
@ -348,7 +348,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam,
|
|||||||
else {
|
else {
|
||||||
// Send a zoom intermediate event, the delta is the change
|
// Send a zoom intermediate event, the delta is the change
|
||||||
// in touch points.
|
// in touch points.
|
||||||
evt.mMessage = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
|
evt.mMessage = eMagnifyGestureUpdate;
|
||||||
// (positive for a "zoom in")
|
// (positive for a "zoom in")
|
||||||
evt.delta = -1.0 * (mZoomIntermediate - (float)gi.ullArguments);
|
evt.delta = -1.0 * (mZoomIntermediate - (float)gi.ullArguments);
|
||||||
mZoomIntermediate = (float)gi.ullArguments;
|
mZoomIntermediate = (float)gi.ullArguments;
|
||||||
|
Loading…
Reference in New Issue
Block a user