github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 10:01:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only scroll one axis at a time, whichever has the greater delta

Browse Source
This commit is contained in:
Nathan Sobo
2017-08-15 16:08:07 -06:00
parent 586b818bae
commit 4493ae2270
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/text-editor-component.js
View File

@@ -1496,8 +1496,14 @@ class TextEditorComponent {
const scrollSensitivity = this.props.model.getScrollSensitivity() / 100
let {deltaX, deltaY} = event
deltaX = deltaX * scrollSensitivity
deltaY = deltaY * scrollSensitivity
if (Math.abs(deltaX) > Math.abs(deltaY)) {
deltaX = deltaX * scrollSensitivity
deltaY = 0
} else {
deltaX = 0
deltaY = deltaY * scrollSensitivity
}
if (this.getPlatform() !== 'darwin' && event.shiftKey) {
let temp = deltaX
@@ -1505,11 +1511,10 @@ class TextEditorComponent {
deltaY = temp
}
const scrollPositionChanged =
this.setScrollLeft(this.getScrollLeft() + deltaX) ||
this.setScrollTop(this.getScrollTop() + deltaY)
const scrollLeftChanged = deltaX !== 0 && this.setScrollLeft(this.getScrollLeft() + deltaX)
const scrollTopChanged = deltaY !== 0 && this.setScrollTop(this.getScrollTop() + deltaY)
if (scrollPositionChanged) this.updateSync()
if (scrollLeftChanged || scrollTopChanged) this.updateSync()
}
didResize () {