Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support horizontal scrolling (hold shift) #2432

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support horizontal scrolling (hold shift) #2432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7668fc8
Support horizontal scrolling (hold shift)
towerofnix Jun 28, 2019
08b8347
Make explicit DOM_DELTA_LINE constant
towerofnix Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/morphic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11456,16 +11456,23 @@ HandMorph.prototype.processMouseScroll = function (event) {
morph = morph.parent;
}
if (morph) {
var x = event.deltaX;
var y = event.deltaY;
if (event.shiftKey && event.deltaX === 0) {
// Scroll horizontally (based on vertical scroll delta). This is
// needed for some browser/system combinations which do not set
// deltaX.
x = y;
y = 0; // Don't scroll vertically.
}

// Multiplier variable, to account for both pixel and line deltaModes.
var DOM_DELTA_LINE = 1;
var multiplier = event.deltaMode === DOM_DELTA_LINE ? -1/3 : -1/53;

morph.mouseScroll(
(event.detail / -3) || (
Object.prototype.hasOwnProperty.call(
event,
'wheelDeltaY'
) ?
event.wheelDeltaY / 120 :
event.wheelDelta / 120
),
event.wheelDeltaX / 120 || 0
y * multiplier,
x * multiplier
);
}
};
Expand Down Expand Up @@ -12096,16 +12103,8 @@ WorldMorph.prototype.initEventListeners = function () {
false
);

canvas.addEventListener( // Safari, Chrome
"mousewheel",
function (event) {
myself.hand.processMouseScroll(event);
event.preventDefault();
},
false
);
canvas.addEventListener( // Firefox
"DOMMouseScroll",
canvas.addEventListener(
"wheel",
function (event) {
myself.hand.processMouseScroll(event);
event.preventDefault();
Expand Down