Use clientHeight for line-numbers and lines containers

This commit is contained in:
Antonio Scandurra
2015-06-04 15:09:15 +02:00
parent 44991f1fb3
commit 57fd553c69
4 changed files with 9 additions and 6 deletions

View File

@@ -15,9 +15,6 @@ module.exports =
# Sets scrollHeight, scrollTop, and backgroundColor on the given domNode.
setDimensionsAndBackground: (oldState, newState, domNode) ->
if newState.scrollHeight isnt oldState.scrollHeight
domNode.style.height = newState.scrollHeight + 'px'
oldState.scrollHeight = newState.scrollHeight
if newState.backgroundColor isnt oldState.backgroundColor
domNode.style.backgroundColor = newState.backgroundColor

View File

@@ -48,6 +48,10 @@ class LineNumberGutterComponent extends TiledComponent
setDimensionsAndBackground(@oldState.styles, @newState.styles, @lineNumbersNode)
if @newState.height isnt @oldState.height
@lineNumbersNode.style.height = @newState.height + "px"
@oldState.height = @newState.height
if @newState.maxLineNumberDigits isnt @oldState.maxLineNumberDigits
@updateDummyLineNumber()
@oldState.styles = {}

View File

@@ -33,9 +33,9 @@ class LinesComponent extends TiledComponent
@oldState.indentGuidesVisible isnt @newState.indentGuidesVisible
beforeUpdateSync: (state) ->
if @newState.scrollHeight isnt @oldState.scrollHeight
@domNode.style.height = @newState.scrollHeight + 'px'
@oldState.scrollHeight = @newState.scrollHeight
if @newState.clientHeight isnt @oldState.clientHeight
@domNode.style.height = @newState.clientHeight + 'px'
@oldState.clientHeight = @newState.clientHeight
if @newState.backgroundColor isnt @oldState.backgroundColor
@domNode.style.backgroundColor = @newState.backgroundColor

View File

@@ -453,6 +453,7 @@ class TextEditorPresenter
return
updateLineNumberGutterState: ->
@lineNumberGutter.height = @clientHeight
@lineNumberGutter.maxLineNumberDigits = @model.getLineCount().toString().length
updateCommonGutterState: ->
@@ -656,6 +657,7 @@ class TextEditorPresenter
clientHeight = @height - @horizontalScrollbarHeight
unless @clientHeight is clientHeight
@clientHeight = clientHeight
@state.content.clientHeight = @clientHeight
@updateScrollHeight()
@updateScrollTop()