github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into structural-folding

Browse Source
This commit is contained in:
Corey Johnson
2012-05-31 11:46:23 -07:00
parent 2df7c26353 fdb8ba8a2b
commit 516de1ede1
2 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/editor.coffee
View File

@@ -450,14 +450,13 @@ class Editor extends View
@compositeCursor.updateBufferPosition() unless e.bufferChanged
if @attached
firstVisibleScreenRow = @getFirstVisibleScreenRow()
lastVisibleScreenRow = @getLastVisibleScreenRow()
@gutter.renderLineNumbers(@firstRenderedScreenRow, @lastRenderedScreenRow) if e.lineNumbersChanged
@verticalScrollbarContent.height(@lineHeight * @screenLineCount())
return if oldScreenRange.start.row > @lastRenderedScreenRow
maxEndRow = Math.max(@getLastVisibleScreenRow() + @lineOverdraw, @lastRenderedScreenRow)
@gutter.renderLineNumbers(@firstRenderedScreenRow, maxEndRow) if e.lineNumbersChanged
newScreenRange = newScreenRange.copy()
oldScreenRange = oldScreenRange.copy()
endOfShortestRange = Math.min(oldScreenRange.end.row, newScreenRange.end.row)
@@ -471,7 +470,6 @@ class Editor extends View
newScreenRange.start.row = Math.max(newScreenRange.start.row, @firstRenderedScreenRow)
oldScreenRange.start.row = Math.max(oldScreenRange.start.row, @firstRenderedScreenRow)
maxEndRow = Math.max(lastVisibleScreenRow, @lastRenderedScreenRow)
newScreenRange.end.row = Math.min(newScreenRange.end.row, maxEndRow)
oldScreenRange.end.row = Math.min(oldScreenRange.end.row, maxEndRow)
@@ -481,6 +479,9 @@ class Editor extends View
rowDelta = newScreenRange.end.row - oldScreenRange.end.row
@lastRenderedScreenRow += rowDelta
@updateVisibleLines() if rowDelta < 0
if @lastRenderedScreenRow > maxEndRow
@removeLineElements(maxEndRow + 1, @lastRenderedScreenRow)
@lastRenderedScreenRow = maxEndRow
buildLineElements: (startRow, endRow) ->
charWidth = @charWidth
@@ -814,3 +815,7 @@ class Editor extends View
logLines: (start, end) ->
@renderer.logLines(start, end)
logRenderedLines: ->
@visibleLines.find('.line').each (n) ->
console.log n, $(this).text()