pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-10 10:17:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use window height to determine number of lines to render

Browse Source 
This prevents the editor from displaying empty lines when a view is hidden
and the editor suddenly has more vertical space available to fill.
This commit is contained in:
Kevin Sawicki 2013-09-30 16:10:06 -07:00
parent 786f35f272
commit 3189347899
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/editor-spec.coffee
View File

@ -13,6 +13,8 @@ describe "Editor", ->
editor.lineOverdraw = 2
editor.isFocused = true
editor.enableKeymap()
editor.calculateHeightInLines = ->
Math.ceil(@height() / @lineHeight)
editor.attachToDom = ({ heightInLines, widthInChars } = {}) ->
heightInLines ?= @getBuffer().getLineCount()
@height(getLineHeight() * heightInLines)

18
src/editor.coffee
View File

@ -498,6 +498,11 @@ class Editor extends View
# {Delegates to: EditSession.getScreenLineCount}
getScreenLineCount: -> @activeEditSession.getScreenLineCount()
# Private:
setHeightInLines: (heightInLines)->
heightInLines ?= @calculateHeightInLines()
@heightInLines = heightInLines if heightInLines
# {Delegates to: EditSession.setEditorWidthInChars}
setWidthInChars: (widthInChars) ->
widthInChars ?= @calculateWidthInChars()
@ -747,6 +752,7 @@ class Editor extends View
@calculateDimensions()
@setWidthInChars()
@subscribe $(window), "resize.editor-#{@id}", =>
@setHeightInLines()
@setWidthInChars()
@requestDisplayUpdate()
@focus() if @isFocused
@ -937,6 +943,9 @@ class Editor extends View
calculateWidthInChars: ->
Math.floor(@scrollView.width() / @charWidth)
calculateHeightInLines: ->
Math.ceil($(window).height() / @lineHeight)
# Enables/disables soft wrap on the editor.
#
# softWrap - A {Boolean} which, if `true`, enables soft wrap
@ -1125,6 +1134,7 @@ class Editor extends View
@charWidth = charRect.width
@charHeight = charRect.height
fragment.remove()
@setHeightInLines()
updateLayerDimensions: ->
height = @lineHeight * @getScreenLineCount()
@ -1227,15 +1237,15 @@ class Editor extends View
updateRenderedLines: ->
firstVisibleScreenRow = @getFirstVisibleScreenRow()
lastVisibleScreenRow = @getLastVisibleScreenRow()
lastScreenRowToRender = firstVisibleScreenRow + @heightInLines - 1
lastScreenRow = @getLastScreenRow()
if @firstRenderedScreenRow? and firstVisibleScreenRow >= @firstRenderedScreenRow and lastVisibleScreenRow <= @lastRenderedScreenRow
if @firstRenderedScreenRow? and firstVisibleScreenRow >= @firstRenderedScreenRow and lastScreenRowToRender <= @lastRenderedScreenRow
renderFrom = Math.min(lastScreenRow, @firstRenderedScreenRow)
renderTo = Math.min(lastScreenRow, @lastRenderedScreenRow)
else
renderFrom = Math.min(lastScreenRow, Math.max(0, firstVisibleScreenRow - @lineOverdraw))
renderTo = Math.min(lastScreenRow, lastVisibleScreenRow + @lineOverdraw)
renderTo = Math.min(lastScreenRow, lastScreenRowToRender + @lineOverdraw)
if @pendingChanges.length == 0 and @firstRenderedScreenRow and @firstRenderedScreenRow <= renderFrom and renderTo <= @lastRenderedScreenRow
return
@ -1382,7 +1392,7 @@ class Editor extends View
getFirstVisibleScreenRow: ->
Math.floor(@scrollTop() / @lineHeight)
# Retrieves the number of the row that is visible and currently at the top of the editor.
# Retrieves the number of the row that is visible and currently at the bottom of the editor.
#
# Returns a {Number}.
getLastVisibleScreenRow: ->