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

Gutter line numbers are rendered similarly to the scroll view's lines

Browse Source
This commit is contained in:
Corey Johnson
2012-05-14 12:32:53 -07:00
parent 5e4aef95d0
commit b35a2502c6
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/editor.coffee
View File

@@ -216,6 +216,7 @@ class Editor extends View
@updateLines()
scrollTop = @verticalScrollbar.scrollTop()
@scrollView.scrollTop(scrollTop)
@gutter.scrollTop(scrollTop)
@scrollView.on 'scroll', =>
if @scrollView.scrollLeft() == 0
@@ -268,12 +269,17 @@ class Editor extends View
@lastRenderedScreenRow = @getLastVisibleScreenRow()
@gutter.renderLineNumbers(@firstRenderedScreenRow, @lastRenderedScreenRow)
@insertLineElements(0, @buildLineElements(@firstRenderedScreenRow, @lastRenderedScreenRow))
@lines.css('padding-top', @firstRenderedScreenRow * @lineHeight)
@lines.css('padding-bottom', (@getLastScreenRow() - @lastRenderedScreenRow) * @lineHeight)
paddingTop = @firstRenderedScreenRow * @lineHeight
paddingBottom = (@getLastScreenRow() - @lastRenderedScreenRow) * @lineHeight
@lines.css('padding-top', paddingTop)
@gutter.lineNumbers.css('padding-top', paddingTop)
@lines.css('padding-bottom', paddingBottom)
@gutter.lineNumbers.css('padding-bottom', paddingBottom)
updateLines: ->
window.xxx = this
firstVisibleScreenRow = @getFirstVisibleScreenRow()
lastVisibleScreenRow = @getLastVisibleScreenRow()
@@ -281,29 +287,33 @@ class Editor extends View
if firstVisibleScreenRow > @firstRenderedScreenRow
@removeLineElements(@firstRenderedScreenRow, firstVisibleScreenRow - 1)
@lines.css('padding-top', firstVisibleScreenRow * @lineHeight)
if lastVisibleScreenRow < @lastRenderedScreenRow
@removeLineElements(lastVisibleScreenRow + 1, @lastRenderedScreenRow)
@lines.css('padding-bottom', (@getLastScreenRow() - lastVisibleScreenRow) * @lineHeight)
if firstVisibleScreenRow < @firstRenderedScreenRow
newLinesStartRow = firstVisibleScreenRow
newLinesEndRow = Math.min(@firstRenderedScreenRow - 1, lastVisibleScreenRow)
lineElements = @buildLineElements(newLinesStartRow, newLinesEndRow)
@insertLineElements(newLinesStartRow, lineElements)
@lines.css('padding-top', firstVisibleScreenRow * @lineHeight)
if lastVisibleScreenRow > @lastRenderedScreenRow
newLinesStartRow = Math.max(@lastRenderedScreenRow + 1, firstVisibleScreenRow)
newLinesEndRow = lastVisibleScreenRow
lineElements = @buildLineElements(newLinesStartRow, newLinesEndRow)
@insertLineElements(newLinesStartRow, lineElements)
@lines.css('padding-bottom', (@getLastScreenRow() - lastVisibleScreenRow) * @lineHeight)
@firstRenderedScreenRow = firstVisibleScreenRow
@lastRenderedScreenRow = lastVisibleScreenRow
if firstVisibleScreenRow != @firstRenderedScreenRow
paddingTop = firstVisibleScreenRow * @lineHeight
@lines.css('padding-top', paddingTop)
@gutter.lineNumbers.css('padding-top', paddingTop)
@firstRenderedScreenRow = firstVisibleScreenRow
if lastVisibleScreenRow != @lastRenderedScreenRow
paddingBottom = (@getLastScreenRow() - lastVisibleScreenRow) * @lineHeight
@lines.css('padding-bottom', paddingBottom)
@gutter.lineNumbers.css('padding-bottom', paddingBottom)
@lastRenderedScreenRow = lastVisibleScreenRow
getFirstVisibleScreenRow: ->
Math.floor(@verticalScrollbar.scrollTop() / @lineHeight)

7
src/app/gutter.coffee
View File

@@ -6,16 +6,15 @@ _ = require 'underscore'
module.exports =
class Gutter extends View
@content: ->
@div class: 'gutter'
@div class: 'gutter', =>
@div outlet: 'lineNumbers', class: 'wtf'
renderLineNumbers: (startScreenRow, endScreenRow) ->
editor = @parentView
lastScreenRow = -1
rows = editor.bufferRowsForScreenRows(startScreenRow, endScreenRow)
@css('margin-top', -editor.verticalScrollbar.scrollTop() % editor.lineHeight)
this[0].innerHTML = $$$ ->
@lineNumbers[0].innerHTML = $$$ ->
for row in rows
@div {class: 'line-number'}, if row == lastScreenRow then '•' else row + 1
lastScreenRow = row