From 8abdc67e7e5cb96ff49ec6cb0d6c7b89c4ac6029 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 4 Jun 2015 15:15:29 +0200 Subject: [PATCH] Revert "Use `clientHeight` for line-numbers and lines containers" This reverts commit f2bab35f57c05d5a0bb21e9fb02117f802ff278b. It didn't actually improve performance, nor memory usage, therefore I decided to avoid changing it for the time being. --- src/gutter-component-helpers.coffee | 3 +++ src/line-number-gutter-component.coffee | 4 ---- src/lines-component.coffee | 6 +++--- src/text-editor-presenter.coffee | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gutter-component-helpers.coffee b/src/gutter-component-helpers.coffee index d938ed10d..499b90552 100644 --- a/src/gutter-component-helpers.coffee +++ b/src/gutter-component-helpers.coffee @@ -15,6 +15,9 @@ 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 diff --git a/src/line-number-gutter-component.coffee b/src/line-number-gutter-component.coffee index 2d0d5049f..7b68c2acd 100644 --- a/src/line-number-gutter-component.coffee +++ b/src/line-number-gutter-component.coffee @@ -48,10 +48,6 @@ 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 = {} diff --git a/src/lines-component.coffee b/src/lines-component.coffee index 039425f7e..92823daf1 100644 --- a/src/lines-component.coffee +++ b/src/lines-component.coffee @@ -33,9 +33,9 @@ class LinesComponent extends TiledComponent @oldState.indentGuidesVisible isnt @newState.indentGuidesVisible beforeUpdateSync: (state) -> - if @newState.clientHeight isnt @oldState.clientHeight - @domNode.style.height = @newState.clientHeight + 'px' - @oldState.clientHeight = @newState.clientHeight + 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 diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 6188eb144..df58ea76c 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -453,7 +453,6 @@ class TextEditorPresenter return updateLineNumberGutterState: -> - @lineNumberGutter.height = @clientHeight @lineNumberGutter.maxLineNumberDigits = @model.getLineCount().toString().length updateCommonGutterState: -> @@ -657,7 +656,6 @@ class TextEditorPresenter clientHeight = @height - @horizontalScrollbarHeight unless @clientHeight is clientHeight @clientHeight = clientHeight - @state.content.clientHeight = @clientHeight @updateScrollHeight() @updateScrollTop()