github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-09 22:24:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/github/atom

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-12-11 16:51:35 -08:00
parent dc60017c02 339eeac0d8
commit 4e9dc5fe71
10 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/editor.coffee
View File

@@ -497,7 +497,13 @@ class Editor extends View
scrollToBottom: ->
@scrollBottom(@screenLineCount() * @lineHeight)
scrollTo: (pixelPosition, options) ->
scrollToBufferPosition: (bufferPosition, options) ->
@scrollToPixelPosition(@pixelPositionForBufferPosition(bufferPosition), options)
scrollToScreenPosition: (screenPosition, options) ->
@scrollToPixelPosition(@pixelPositionForScreenPosition(screenPosition), options)
scrollToPixelPosition: (pixelPosition, options) ->
return unless @attached
@scrollVertically(pixelPosition, options)
@scrollHorizontally(pixelPosition)
@@ -800,11 +806,11 @@ class Editor extends View
autoscroll: (options={}) ->
for cursorView in @getCursorViews() when cursorView.needsAutoscroll()
@scrollTo(cursorView.getPixelPosition()) unless options.suppressAutoScroll
@scrollToPixelPosition(cursorView.getPixelPosition()) unless options.suppressAutoScroll
cursorView.autoscrolled()
for selectionView in @getSelectionViews() when selectionView.needsAutoscroll()
@scrollTo(selectionView.getCenterPixelPosition(), center: true)
@scrollToPixelPosition(selectionView.getCenterPixelPosition(), center: true)
selectionView.autoscrolled()
updateRenderedLines: ->
@@ -1025,6 +1031,9 @@ class Editor extends View
@renderedLines.find('.line').each (n) ->
console.log n, $(this).text()
pixelPositionForBufferPosition: (position) ->
@pixelPositionForScreenPosition(@screenPositionForBufferPosition(position))
pixelPositionForScreenPosition: (position) ->
position = Point.fromObject(position)
{ top: position.row * @lineHeight, left: position.column * @charWidth }