mirror of
https://github.com/atom/atom.git
synced 2026-01-24 22:38:20 -05:00
🔥
This commit is contained in:
@@ -3453,14 +3453,14 @@ describe "TextEditorComponent", ->
|
||||
expect(wrapperNode.getScrollTop()).toBe 0
|
||||
expect(wrapperNode.getScrollLeft()).toBe 0
|
||||
|
||||
wrapperNode.scrollToCursorPosition()
|
||||
editor.scrollToCursorPosition()
|
||||
nextAnimationFrame()
|
||||
expect(wrapperNode.getScrollTop()).toBe (8.8 * 10) - 30
|
||||
expect(wrapperNode.getScrollBottom()).toBe (8.3 * 10) + 30
|
||||
expect(wrapperNode.getScrollRight()).toBe (9 + editor.getHorizontalScrollMargin()) * 10
|
||||
|
||||
wrapperNode.setScrollTop(0)
|
||||
wrapperNode.scrollToCursorPosition(center: false)
|
||||
editor.scrollToCursorPosition(center: false)
|
||||
expect(wrapperNode.getScrollTop()).toBe (7.8 - editor.getVerticalScrollMargin()) * 10
|
||||
expect(wrapperNode.getScrollBottom()).toBe (9.3 + editor.getVerticalScrollMargin()) * 10
|
||||
|
||||
|
||||
@@ -237,9 +237,6 @@ class TextEditorElement extends HTMLElement
|
||||
scrollToBottom: ->
|
||||
@setScrollBottom(Infinity)
|
||||
|
||||
scrollToCursorPosition: (options) ->
|
||||
@getModel().getLastCursor().autoscroll(center: options?.center ? true)
|
||||
|
||||
getScrollTop: ->
|
||||
@component.getScrollTop()
|
||||
|
||||
|
||||
@@ -1552,14 +1552,12 @@ class TextEditorPresenter
|
||||
if scrollLeft isnt @scrollLeft and not Number.isNaN(scrollLeft)
|
||||
@realScrollLeft = scrollLeft
|
||||
@scrollLeft = Math.round(scrollLeft)
|
||||
@model.setScrollLeft(@scrollLeft)
|
||||
|
||||
commitPendingScrollTopPosition: ->
|
||||
scrollTop = @constrainScrollTop(@pendingScrollTop)
|
||||
if scrollTop isnt @scrollTop and not Number.isNaN(scrollTop)
|
||||
@realScrollTop = scrollTop
|
||||
@scrollTop = Math.round(scrollTop)
|
||||
@model.setScrollTop(@scrollTop)
|
||||
|
||||
updateScrollPosition: ->
|
||||
@commitPendingLogicalScrollPosition() if @pendingScrollLogicalPosition?
|
||||
|
||||
Reference in New Issue
Block a user