mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1259664 part.1 Rename WidgetWheelEvent::deltaX to WidgetWheelEvent::mDeltaX r=smaug 

MozReview-Commit-ID: F5dQHpPkWfA

--HG--
extra : rebase_source : 1a256f288b0e004c196468f8659393b474d73840
This commit is contained in:
Masayuki Nakano 2016-03-31 18:55:59 +09:00
Родитель d21c70dd6c
Коммит 6cedf549dc
14 изменённых файлов: 58 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/base/nsDOMWindowUtils.cpp
Просмотреть файл

@ -793,7 +793,7 @@ nsDOMWindowUtils::SendWheelEvent(float aX,
WidgetWheelEvent wheelEvent(true, eWheel, widget);
wheelEvent.mModifiers = nsContentUtils::GetWidgetModifiers(aModifiers);
wheelEvent.deltaX = aDeltaX;
wheelEvent.mDeltaX = aDeltaX;
wheelEvent.deltaY = aDeltaY;
wheelEvent.deltaZ = aDeltaZ;
wheelEvent.deltaMode = aDeltaMode;

36
dom/events/EventStateManager.cpp
Просмотреть файл

@ -2194,21 +2194,21 @@ EventStateManager::DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame,
!aEvent->lineOrPageDeltaY ? 0 :
(aEvent->lineOrPageDeltaY > 0 ? nsIDOMUIEvent::SCROLL_PAGE_DOWN :
nsIDOMUIEvent::SCROLL_PAGE_UP);
pixelDeltaX = RoundDown(aEvent->deltaX * scrollAmountInCSSPixels.width);
pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width);
pixelDeltaY = RoundDown(aEvent->deltaY * scrollAmountInCSSPixels.height);
break;
case nsIDOMWheelEvent::DOM_DELTA_LINE:
scrollDeltaX = aEvent->lineOrPageDeltaX;
scrollDeltaY = aEvent->lineOrPageDeltaY;
pixelDeltaX = RoundDown(aEvent->deltaX * scrollAmountInCSSPixels.width);
pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width);
pixelDeltaY = RoundDown(aEvent->deltaY * scrollAmountInCSSPixels.height);
break;
case nsIDOMWheelEvent::DOM_DELTA_PIXEL:
scrollDeltaX = aEvent->lineOrPageDeltaX;
scrollDeltaY = aEvent->lineOrPageDeltaY;
pixelDeltaX = RoundDown(aEvent->deltaX);
pixelDeltaX = RoundDown(aEvent->mDeltaX);
pixelDeltaY = RoundDown(aEvent->deltaY);
break;
@ -2360,7 +2360,7 @@ EventStateManager::ComputeScrollTarget(nsIFrame* aTargetFrame,
WidgetWheelEvent* aEvent,
ComputeScrollTargetOptions aOptions)
{
return ComputeScrollTarget(aTargetFrame, aEvent->deltaX, aEvent->deltaY,
return ComputeScrollTarget(aTargetFrame, aEvent->mDeltaX, aEvent->deltaY,
aEvent, aOptions);
}
@ -2656,11 +2656,11 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
// additional action such as moving history. In such case, overflowDelta
// values should stay zero.
if (scrollFrameWeak.IsAlive()) {
if (aEvent->deltaX &&
if (aEvent->mDeltaX &&
overflowStyle.mHorizontal == NS_STYLE_OVERFLOW_HIDDEN &&
!ComputeScrollTarget(scrollFrame, aEvent,
COMPUTE_SCROLLABLE_ANCESTOR_ALONG_X_AXIS)) {
aEvent->overflowDeltaX = aEvent->deltaX;
aEvent->overflowDeltaX = aEvent->mDeltaX;
}
if (aEvent->deltaY &&
overflowStyle.mVertical == NS_STYLE_OVERFLOW_HIDDEN &&
@ -2671,7 +2671,7 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
}
NS_ASSERTION(aEvent->overflowDeltaX == 0 ||
(aEvent->overflowDeltaX > 0) == (aEvent->deltaX > 0),
(aEvent->overflowDeltaX > 0) == (aEvent->mDeltaX > 0),
"The sign of overflowDeltaX is different from the scroll direction");
NS_ASSERTION(aEvent->overflowDeltaY == 0 ||
(aEvent->overflowDeltaY > 0) == (aEvent->deltaY > 0),
@ -3202,7 +3202,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
ScrollbarsForWheel::PrepareToScrollText(this, aTargetFrame, wheelEvent);
if (aEvent->mMessage != eWheel ||
(!wheelEvent->deltaX && !wheelEvent->deltaY)) {
(!wheelEvent->mDeltaX && !wheelEvent->deltaY)) {
break;
}
@ -3218,7 +3218,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
if (!scrollTarget || scrollTarget == rootScrollableFrame) {
wheelEvent->mViewPortIsOverscrolled = true;
}
wheelEvent->overflowDeltaX = wheelEvent->deltaX;
wheelEvent->overflowDeltaX = wheelEvent->mDeltaX;
wheelEvent->overflowDeltaY = wheelEvent->deltaY;
WheelPrefs::GetInstance()->
CancelApplyingUserPrefsFromOverflowDelta(wheelEvent);
@ -3254,7 +3254,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
MOZ_ASSERT(pluginFrame);
if (wheelEvent->mMessage != eWheel ||
(!wheelEvent->deltaX && !wheelEvent->deltaY)) {
(!wheelEvent->mDeltaX && !wheelEvent->deltaY)) {
break;
}
@ -3289,7 +3289,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
if (!allDeltaOverflown) {
break;
}
wheelEvent->overflowDeltaX = wheelEvent->deltaX;
wheelEvent->overflowDeltaX = wheelEvent->mDeltaX;
wheelEvent->overflowDeltaY = wheelEvent->deltaY;
WheelPrefs::GetInstance()->
CancelApplyingUserPrefsFromOverflowDelta(wheelEvent);
@ -5355,7 +5355,7 @@ EventStateManager::DeltaAccumulator::InitLineOrPageDelta(
} else {
// If the delta direction is changed, we should reset only the
// accumulated values.
if (mX && aEvent->deltaX && ((aEvent->deltaX > 0.0) != (mX > 0.0))) {
if (mX && aEvent->mDeltaX && ((aEvent->mDeltaX > 0.0) != (mX > 0.0))) {
mX = mPendingScrollAmountX = 0.0;
}
if (mY && aEvent->deltaY && ((aEvent->deltaY > 0.0) != (mY > 0.0))) {
@ -5378,8 +5378,8 @@ EventStateManager::DeltaAccumulator::InitLineOrPageDelta(
// is changed.
// NOTE: We shouldn't accumulate the delta values, it might could cause
// overflow even though it's not a realistic situation.
if (aEvent->deltaX) {
mX = aEvent->deltaX;
if (aEvent->mDeltaX) {
mX = aEvent->mDeltaX;
}
if (aEvent->deltaY) {
mY = aEvent->deltaY;
@ -5388,7 +5388,7 @@ EventStateManager::DeltaAccumulator::InitLineOrPageDelta(
return;
}
mX += aEvent->deltaX;
mX += aEvent->mDeltaX;
mY += aEvent->deltaY;
if (mHandlingDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL) {
@ -5640,7 +5640,7 @@ EventStateManager::WheelPrefs::ApplyUserPrefsToDelta(WidgetWheelEvent* aEvent)
Index index = GetIndexFor(aEvent);
Init(index);
aEvent->deltaX *= mMultiplierX[index];
aEvent->mDeltaX *= mMultiplierX[index];
aEvent->deltaY *= mMultiplierY[index];
aEvent->deltaZ *= mMultiplierZ[index];
@ -5688,8 +5688,8 @@ EventStateManager::WheelPrefs::ComputeActionFor(WidgetWheelEvent* aEvent)
Init(index);
bool deltaXPreferred =
(Abs(aEvent->deltaX) > Abs(aEvent->deltaY) &&
Abs(aEvent->deltaX) > Abs(aEvent->deltaZ));
(Abs(aEvent->mDeltaX) > Abs(aEvent->deltaY) &&
Abs(aEvent->mDeltaX) > Abs(aEvent->deltaZ));
Action* actions = deltaXPreferred ? mOverriddenActionsX : mActions;
if (actions[index] == ACTION_NONE || actions[index] == ACTION_SCROLL) {
return actions[index];

6
dom/events/WheelEvent.cpp
Просмотреть файл

@ -65,7 +65,7 @@ WheelEvent::InitWheelEvent(const nsAString& aType,
aRelatedTarget, aModifiersList);
WidgetWheelEvent* wheelEvent = mEvent->AsWheelEvent();
wheelEvent->deltaX = aDeltaX;
wheelEvent->mDeltaX = aDeltaX;
wheelEvent->deltaY = aDeltaY;
wheelEvent->deltaZ = aDeltaZ;
wheelEvent->deltaMode = aDeltaMode;
@ -75,9 +75,9 @@ double
WheelEvent::DeltaX()
{
if (!mAppUnitsPerDevPixel) {
return mEvent->AsWheelEvent()->deltaX;
return mEvent->AsWheelEvent()->mDeltaX;
}
return mEvent->AsWheelEvent()->deltaX *
return mEvent->AsWheelEvent()->mDeltaX *
mAppUnitsPerDevPixel / nsPresContext::AppUnitsPerCSSPixel();
}

6
dom/events/WheelHandlingHelper.cpp
Просмотреть файл

@ -30,7 +30,7 @@ namespace mozilla {
/******************************************************************/
DeltaValues::DeltaValues(WidgetWheelEvent* aEvent)
: deltaX(aEvent->deltaX)
: deltaX(aEvent->mDeltaX)
, deltaY(aEvent->deltaY)
{
}
@ -129,7 +129,7 @@ WheelTransaction::UpdateTransaction(WidgetWheelEvent* aEvent)
}
if (!WheelHandlingUtils::CanScrollOn(scrollToFrame,
aEvent->deltaX, aEvent->deltaY)) {
aEvent->mDeltaX, aEvent->deltaY)) {
OnFailToScrollTarget();
// We should not modify the transaction state when the view will not be
// scrolled actually.
@ -409,7 +409,7 @@ WheelTransaction::OverrideSystemScrollSpeed(WidgetWheelEvent* aEvent)
// If the event doesn't scroll to both X and Y, we don't need to do anything
// here.
if (!aEvent->deltaX && !aEvent->deltaY) {
if (!aEvent->mDeltaX && !aEvent->deltaY) {
return DeltaValues(aEvent);
}

2
gfx/layers/apz/src/APZCTreeManager.cpp
Просмотреть файл

@ -1097,7 +1097,7 @@ APZCTreeManager::ProcessWheelEvent(WidgetWheelEvent& aEvent,
scrollMode,
ScrollWheelInput::DeltaTypeForDeltaMode(aEvent.deltaMode),
origin,
aEvent.deltaX, aEvent.deltaY,
aEvent.mDeltaX, aEvent.deltaY,
aEvent.mAllowToOverrideSystemScrollSpeed);
// We add the user multiplier as a separate field, rather than premultiplying

6
widget/InputData.cpp
Просмотреть файл

@ -396,7 +396,7 @@ PanGestureInput::ToWidgetWheelEvent(nsIWidget* aWidget) const
wheelEvent.isMomentum = IsMomentum();
wheelEvent.lineOrPageDeltaX = mLineOrPageDeltaX;
wheelEvent.lineOrPageDeltaY = mLineOrPageDeltaY;
wheelEvent.deltaX = mPanDisplacement.x;
wheelEvent.mDeltaX = mPanDisplacement.x;
wheelEvent.deltaY = mPanDisplacement.y;
wheelEvent.mFlags.mHandledByAPZ = mHandledByAPZ;
return wheelEvent;
@ -463,7 +463,7 @@ ScrollWheelInput::ScrollWheelInput(const WidgetWheelEvent& aWheelEvent)
, mDeltaType(DeltaTypeForDeltaMode(aWheelEvent.deltaMode))
, mScrollMode(SCROLLMODE_INSTANT)
, mHandledByAPZ(aWheelEvent.mFlags.mHandledByAPZ)
, mDeltaX(aWheelEvent.deltaX)
, mDeltaX(aWheelEvent.mDeltaX)
, mDeltaY(aWheelEvent.deltaY)
, mLineOrPageDeltaX(aWheelEvent.lineOrPageDeltaX)
, mLineOrPageDeltaY(aWheelEvent.lineOrPageDeltaY)
@ -494,7 +494,7 @@ ScrollWheelInput::ToWidgetWheelEvent(nsIWidget* aWidget) const
wheelEvent.deltaMode = DeltaModeForDeltaType(mDeltaType);
wheelEvent.mayHaveMomentum = mMayHaveMomentum;
wheelEvent.isMomentum = mIsMomentum;
wheelEvent.deltaX = mDeltaX;
wheelEvent.mDeltaX = mDeltaX;
wheelEvent.deltaY = mDeltaY;
wheelEvent.lineOrPageDeltaX = mLineOrPageDeltaX;
wheelEvent.lineOrPageDeltaY = mLineOrPageDeltaY;

14
widget/MouseEvents.h
Просмотреть файл

@ -448,7 +448,7 @@ private:
friend class mozilla::dom::PBrowserChild;
WidgetWheelEvent()
: deltaX(0.0)
: mDeltaX(0.0)
, deltaY(0.0)
, deltaZ(0.0)
, deltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
@ -471,7 +471,7 @@ public:
WidgetWheelEvent(bool aIsTrusted, EventMessage aMessage, nsIWidget* aWidget)
: WidgetMouseEventBase(aIsTrusted, aMessage, aWidget, eWheelEventClass)
, deltaX(0.0)
, mDeltaX(0.0)
, deltaY(0.0)
, deltaZ(0.0)
, deltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
@ -511,11 +511,11 @@ public:
this->overflowDeltaX != 0.0;
}
// NOTE: deltaX, deltaY and deltaZ may be customized by
// NOTE: mDeltaX, deltaY and deltaZ may be customized by
// mousewheel.*.delta_multiplier_* prefs which are applied by
// EventStateManager. So, after widget dispatches this event,
// these delta values may have different values than before.
double deltaX;
double mDeltaX;
double deltaY;
double deltaZ;
@ -583,11 +583,11 @@ public:
// nsEventStateManger. If the default action of the wheel event isn't scroll,
// these values always zero. Otherwise, remaning delta values which are
// not used by scroll are set.
// NOTE: deltaX, deltaY and deltaZ may be modified by EventStateManager.
// NOTE: mDeltaX, deltaY and deltaZ may be modified by EventStateManager.
// However, overflowDeltaX and overflowDeltaY indicate unused original
// delta values which are not applied the delta_multiplier prefs.
// So, if widget wanted to know the actual direction to be scrolled,
// it would need to check the deltaX and deltaY.
// it would need to check the mDeltaX and deltaY.
double overflowDeltaX;
double overflowDeltaY;
@ -610,7 +610,7 @@ public:
{
AssignMouseEventBaseData(aEvent, aCopyTargets);
deltaX = aEvent.deltaX;
mDeltaX = aEvent.mDeltaX;
deltaY = aEvent.deltaY;
deltaZ = aEvent.deltaZ;
deltaMode = aEvent.deltaMode;

6
widget/WidgetEventImpl.cpp
Просмотреть файл

@ -277,7 +277,7 @@ WidgetEvent::IsAllowedToDispatchDOMEvent() const
// wheel event whose all delta values are zero by user pref applied, it
// shouldn't cause a DOM event.
const WidgetWheelEvent* wheelEvent = AsWheelEvent();
return wheelEvent->deltaX != 0.0 || wheelEvent->deltaY != 0.0 ||
return wheelEvent->mDeltaX != 0.0 || wheelEvent->deltaY != 0.0 ||
wheelEvent->deltaZ != 0.0;
}
@ -385,9 +385,9 @@ double
WidgetWheelEvent::OverriddenDeltaX() const
{
if (!mAllowToOverrideSystemScrollSpeed) {
return deltaX;
return mDeltaX;
}
return ComputeOverriddenDelta(deltaX, false);
return ComputeOverriddenDelta(mDeltaX, false);
}
double

6
widget/cocoa/nsChildView.mm
Просмотреть файл

@ -2790,7 +2790,8 @@ nsChildView::DispatchAPZWheelInputEvent(InputData& aEvent, bool aCanTriggerSwipe
MOZ_CRASH("unsupported event type");
return;
}
if (event.mMessage == eWheel && (event.deltaX != 0 || event.deltaY != 0)) {
if (event.mMessage == eWheel &&
(event.mDeltaX != 0 || event.deltaY != 0)) {
ProcessUntransformedAPZEvent(&event, guid, inputBlockId, result);
}
return;
@ -2850,7 +2851,8 @@ nsChildView::DispatchAPZWheelInputEvent(InputData& aEvent, bool aCanTriggerSwipe
MOZ_CRASH("unexpected event type");
return;
}
if (event.mMessage == eWheel && (event.deltaX != 0 || event.deltaY != 0)) {
if (event.mMessage == eWheel &&
(event.mDeltaX != 0 || event.deltaY != 0)) {
DispatchEvent(&event, status);
}
}

6
widget/gtk/nsWindow.cpp
Просмотреть файл

@ -3189,7 +3189,7 @@ nsWindow::OnScrollEvent(GdkEventScroll *aEvent)
mLastScrollEventTime = aEvent->time;
// TODO - use a more appropriate scrolling unit than lines.
// Multiply event deltas by 3 to emulate legacy behaviour.
wheelEvent.deltaX = aEvent->delta_x * 3;
wheelEvent.mDeltaX = aEvent->delta_x * 3;
wheelEvent.deltaY = aEvent->delta_y * 3;
wheelEvent.mIsNoLineOrPageDelta = true;
// This next step manually unsets smooth scrolling for touch devices
@ -3211,10 +3211,10 @@ nsWindow::OnScrollEvent(GdkEventScroll *aEvent)
wheelEvent.deltaY = wheelEvent.lineOrPageDeltaY = 3;
break;
case GDK_SCROLL_LEFT:
wheelEvent.deltaX = wheelEvent.lineOrPageDeltaX = -1;
wheelEvent.mDeltaX = wheelEvent.lineOrPageDeltaX = -1;
break;
case GDK_SCROLL_RIGHT:
wheelEvent.deltaX = wheelEvent.lineOrPageDeltaX = 1;
wheelEvent.mDeltaX = wheelEvent.lineOrPageDeltaX = 1;
break;
}

4
widget/nsGUIEventIPC.h
Просмотреть файл

@ -160,7 +160,7 @@ struct ParamTraits<mozilla::WidgetWheelEvent>
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<mozilla::WidgetMouseEventBase>(aParam));
WriteParam(aMsg, aParam.deltaX);
WriteParam(aMsg, aParam.mDeltaX);
WriteParam(aMsg, aParam.deltaY);
WriteParam(aMsg, aParam.deltaZ);
WriteParam(aMsg, aParam.deltaMode);
@ -184,7 +184,7 @@ struct ParamTraits<mozilla::WidgetWheelEvent>
bool rv =
ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetMouseEventBase*>(aResult)) &&
ReadParam(aMsg, aIter, &aResult->deltaX) &&
ReadParam(aMsg, aIter, &aResult->mDeltaX) &&
ReadParam(aMsg, aIter, &aResult->deltaY) &&
ReadParam(aMsg, aIter, &aResult->deltaZ) &&
ReadParam(aMsg, aIter, &aResult->deltaMode) &&

2
widget/qt/nsWindow.cpp
Просмотреть файл

@ -1280,7 +1280,7 @@ nsWindow::wheelEvent(QWheelEvent* aEvent)
wheelEvent.deltaY = wheelEvent.lineOrPageDeltaY = delta;
break;
case Qt::Horizontal:
wheelEvent.deltaX = wheelEvent.lineOrPageDeltaX = delta;
wheelEvent.mDeltaX = wheelEvent.lineOrPageDeltaX = delta;
break;
default:
Q_ASSERT(0);

12
widget/windows/WinMouseScrollHandler.cpp
Просмотреть файл

@ -676,7 +676,7 @@ MouseScrollHandler::HandleScrollMessageAsMouseWheelMessage(nsWindowBase* aWidget
WidgetWheelEvent wheelEvent(true, eWheel, aWidget);
double& delta =
(aMessage == MOZ_WM_VSCROLL) ? wheelEvent.deltaY : wheelEvent.deltaX;
(aMessage == MOZ_WM_VSCROLL) ? wheelEvent.deltaY : wheelEvent.mDeltaX;
int32_t& lineOrPageDelta =
(aMessage == MOZ_WM_VSCROLL) ? wheelEvent.lineOrPageDeltaY :
wheelEvent.lineOrPageDeltaX;
@ -711,12 +711,12 @@ MouseScrollHandler::HandleScrollMessageAsMouseWheelMessage(nsWindowBase* aWidget
MOZ_LOG(gMouseScrollLog, LogLevel::Info,
("MouseScroll::HandleScrollMessageAsMouseWheelMessage: aWidget=%p, "
"aMessage=MOZ_WM_%sSCROLL, aWParam=0x%08X, aLParam=0x%08X, "
"wheelEvent { refPoint: { x: %d, y: %d }, deltaX: %f, deltaY: %f, "
"wheelEvent { refPoint: { x: %d, y: %d }, mDeltaX: %f, deltaY: %f, "
"lineOrPageDeltaX: %d, lineOrPageDeltaY: %d, "
"isShift: %s, isControl: %s, isAlt: %s, isMeta: %s }",
aWidget, (aMessage == MOZ_WM_VSCROLL) ? "V" : "H", aWParam, aLParam,
wheelEvent.refPoint.x, wheelEvent.refPoint.y,
wheelEvent.deltaX, wheelEvent.deltaY,
wheelEvent.mDeltaX, wheelEvent.deltaY,
wheelEvent.lineOrPageDeltaX, wheelEvent.lineOrPageDeltaY,
GetBoolName(wheelEvent.IsShift()),
GetBoolName(wheelEvent.IsControl()),
@ -848,7 +848,7 @@ MouseScrollHandler::LastEventInfo::InitWheelEvent(
aWheelEvent.deltaMode = mIsPage ? nsIDOMWheelEvent::DOM_DELTA_PAGE :
nsIDOMWheelEvent::DOM_DELTA_LINE;
double& delta = mIsVertical ? aWheelEvent.deltaY : aWheelEvent.deltaX;
double& delta = mIsVertical ? aWheelEvent.deltaY : aWheelEvent.mDeltaX;
int32_t& lineOrPageDelta = mIsVertical ? aWheelEvent.lineOrPageDeltaY :
aWheelEvent.lineOrPageDeltaX;
@ -896,13 +896,13 @@ MouseScrollHandler::LastEventInfo::InitWheelEvent(
MOZ_LOG(gMouseScrollLog, LogLevel::Info,
("MouseScroll::LastEventInfo::InitWheelEvent: aWidget=%p, "
"aWheelEvent { refPoint: { x: %d, y: %d }, deltaX: %f, deltaY: %f, "
"aWheelEvent { refPoint: { x: %d, y: %d }, mDeltaX: %f, deltaY: %f, "
"lineOrPageDeltaX: %d, lineOrPageDeltaY: %d, "
"isShift: %s, isControl: %s, isAlt: %s, isMeta: %s, "
"mAllowToOverrideSystemScrollSpeed: %s }, "
"mAccumulatedDelta: %d",
aWidget, aWheelEvent.refPoint.x, aWheelEvent.refPoint.y,
aWheelEvent.deltaX, aWheelEvent.deltaY,
aWheelEvent.mDeltaX, aWheelEvent.deltaY,
aWheelEvent.lineOrPageDeltaX, aWheelEvent.lineOrPageDeltaY,
GetBoolName(aWheelEvent.IsShift()),
GetBoolName(aWheelEvent.IsControl()),

6
widget/windows/nsWinGesture.cpp
Просмотреть файл

@ -565,7 +565,7 @@ nsWinGesture::PanFeedbackFinalize(HWND hWnd, bool endFeedback)
bool
nsWinGesture::PanDeltaToPixelScroll(WidgetWheelEvent& aWheelEvent)
{
aWheelEvent.deltaX = aWheelEvent.deltaY = aWheelEvent.deltaZ = 0.0;
aWheelEvent.mDeltaX = aWheelEvent.deltaY = aWheelEvent.deltaZ = 0.0;
aWheelEvent.lineOrPageDeltaX = aWheelEvent.lineOrPageDeltaY = 0;
aWheelEvent.refPoint.x = mPanRefPoint.x;
@ -581,11 +581,11 @@ nsWinGesture::PanDeltaToPixelScroll(WidgetWheelEvent& aWheelEvent)
// panning back from a max feedback position. This keeps the original drag point
// constant.
if (!mXAxisFeedback) {
aWheelEvent.deltaX = mPixelScrollDelta.x;
aWheelEvent.mDeltaX = mPixelScrollDelta.x;
}
if (!mYAxisFeedback) {
aWheelEvent.deltaY = mPixelScrollDelta.y;
}
return (aWheelEvent.deltaX != 0 || aWheelEvent.deltaY != 0);
return (aWheelEvent.mDeltaX != 0 || aWheelEvent.deltaY != 0);
}