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

Merge pull request #10062 from atom/mb-emit-state-update-on-model-scroll

Browse Source 
Emit state update when model's scroll position is changed
This commit is contained in:
Max Brunsfeld
2015-12-14 17:38:36 -08:00
parent c90aabed92 02ab7179ce
commit a16b99fa58
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/text-editor-presenter-spec.coffee
View File

@@ -782,6 +782,11 @@ describe "TextEditorPresenter", ->
getState(presenter) # commits scroll position
expect(editor.getFirstVisibleScreenRow()).toBe 6
it "updates when the model's scroll position is changed directly", ->
presenter = buildPresenter(scrollTop: 0, explicitHeight: 20, horizontalScrollbarHeight: 10, lineHeight: 10)
expectStateUpdate presenter, -> editor.setFirstVisibleScreenRow(1)
expect(getState(presenter).content.scrollTop).toBe 10
it "reassigns the scrollTop if it exceeds the max possible value after lines are removed", ->
presenter = buildPresenter(scrollTop: 80, lineHeight: 10, explicitHeight: 50, horizontalScrollbarHeight: 0)
expect(getState(presenter).content.scrollTop).toBe(80)

2
src/text-editor-presenter.coffee
View File

@@ -1264,7 +1264,7 @@ class TextEditorPresenter
@emitDidUpdateState()
didChangeFirstVisibleScreenRow: (screenRow) ->
@updateScrollTop(screenRow * @lineHeight)
@setScrollTop(screenRow * @lineHeight)
getVerticalScrollMarginInPixels: ->
Math.round(@model.getVerticalScrollMargin() * @lineHeight)