Don't use config for scrollSensitivity in TextEditorComponent

Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld
2016-07-27 15:35:56 -07:00
committed by Nathan Sobo
parent 4c03cb39de
commit 63a730253b
3 changed files with 9 additions and 32 deletions

View File

@@ -18,7 +18,6 @@ LineTopIndex = require 'line-top-index'
module.exports =
class TextEditorComponent
scrollSensitivity: 0.4
cursorBlinkPeriod: 800
cursorBlinkResumeDelay: 100
tileSize: 12
@@ -47,8 +46,6 @@ class TextEditorComponent
@tileSize = tileSize if tileSize?
@disposables = new CompositeDisposable
@setScrollSensitivity(@config.get('editor.scrollSensitivity'))
lineTopIndex = new LineTopIndex({
defaultLineHeight: @editor.getLineHeightInPixels()
})
@@ -340,7 +337,6 @@ class TextEditorComponent
@disposables.add(@scopedConfigDisposables)
scope = @editor.getRootScopeDescriptor()
@scopedConfigDisposables.add @config.observe 'editor.scrollSensitivity', {scope}, @setScrollSensitivity
focused: ->
if @mounted
@@ -408,7 +404,7 @@ class TextEditorComponent
if Math.abs(wheelDeltaX) > Math.abs(wheelDeltaY)
# Scrolling horizontally
previousScrollLeft = @presenter.getScrollLeft()
updatedScrollLeft = previousScrollLeft - Math.round(wheelDeltaX * @scrollSensitivity)
updatedScrollLeft = previousScrollLeft - Math.round(wheelDeltaX * @editor.getScrollSensitivity() / 100)
event.preventDefault() if @presenter.canScrollLeftTo(updatedScrollLeft)
@presenter.setScrollLeft(updatedScrollLeft)
@@ -416,7 +412,7 @@ class TextEditorComponent
# Scrolling vertically
@presenter.setMouseWheelScreenRow(@screenRowForNode(event.target))
previousScrollTop = @presenter.getScrollTop()
updatedScrollTop = previousScrollTop - Math.round(wheelDeltaY * @scrollSensitivity)
updatedScrollTop = previousScrollTop - Math.round(wheelDeltaY * @editor.getScrollSensitivity() / 100)
event.preventDefault() if @presenter.canScrollTopTo(updatedScrollTop)
@presenter.setScrollTop(updatedScrollTop)
@@ -926,10 +922,6 @@ class TextEditorComponent
@linesYardstick.invalidateCache()
@presenter.measurementsChanged()
setScrollSensitivity: (scrollSensitivity) =>
if scrollSensitivity = parseInt(scrollSensitivity)
@scrollSensitivity = Math.abs(scrollSensitivity) / 100
screenPositionForMouseEvent: (event, linesClientRect) ->
pixelPosition = @pixelPositionForMouseEvent(event, linesClientRect)
@screenPositionForPixelPosition(pixelPosition)

View File

@@ -80,6 +80,7 @@ class TextEditor extends Model
atomicSoftTabs: true
invisibles: null
showLineNumbers: true
scrollSensitivity: 40
Object.defineProperty @prototype, "element",
get: -> @getElement()
@@ -3359,6 +3360,10 @@ class TextEditor extends Model
getScrollPastEnd: -> @scrollPastEnd
setScrollSensitivity: (@scrollSensitivity) ->
getScrollSensitivity: -> @scrollSensitivity
setShowLineNumbers: (showLineNumbers) ->
if showLineNumbers isnt @showLineNumbers
@showLineNumbers = showLineNumbers