From 02ab7179ce553658a60719a7f9ca4cc2c8a8cf49 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 14 Dec 2015 16:56:53 -0800 Subject: [PATCH] Emit state update when model's scroll position is changed --- spec/text-editor-presenter-spec.coffee | 5 +++++ src/text-editor-presenter.coffee | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee index effa579b1..2d5a37886 100644 --- a/spec/text-editor-presenter-spec.coffee +++ b/spec/text-editor-presenter-spec.coffee @@ -807,6 +807,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) diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 5cfaeebcf..a613ee403 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -1447,7 +1447,7 @@ class TextEditorPresenter @emitDidUpdateState() didChangeFirstVisibleScreenRow: (screenRow) -> - @updateScrollTop(screenRow * @lineHeight) + @setScrollTop(screenRow * @lineHeight) getVerticalScrollMarginInPixels: -> Math.round(@model.getVerticalScrollMargin() * @lineHeight)