wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-08-11 23:34:26 -04:00
commit 902d64ba8e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/events/src/nsEventStateManager.cpp
View File

@ -2853,13 +2853,13 @@ nsEventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
nsIntPoint actualDevPixelScrollAmount(0, 0);
if (isDeltaModePixel) {
actualDevPixelScrollAmount.x = RoundDown(aEvent->deltaX);
actualDevPixelScrollAmount.y = RoundDown(aEvent->deltaY);
actualDevPixelScrollAmount.x = RoundDown(acceleratedDelta.deltaX);
actualDevPixelScrollAmount.y = RoundDown(acceleratedDelta.deltaY);
} else {
actualDevPixelScrollAmount.x =
RoundDown(scrollAmountInDevPixels.width * aEvent->deltaX);
RoundDown(scrollAmountInDevPixels.width * acceleratedDelta.deltaX);
actualDevPixelScrollAmount.y =
RoundDown(scrollAmountInDevPixels.height * aEvent->deltaY);
RoundDown(scrollAmountInDevPixels.height * acceleratedDelta.deltaY);
}
nsIAtom* origin = nullptr;
@ -3272,6 +3272,8 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
case WheelPrefs::ACTION_ZOOM:
DoScrollZoom(aTargetFrame, wheelEvent->GetPreferredIntDelta());
break;
default:
break;
}
*aStatus = nsEventStatus_eConsumeNoDefault;
}