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

Take the gutter width into account when sizing TextEditorElement

Browse Source
This commit is contained in:
Antonio Scandurra
2016-08-17 18:33:04 +02:00
parent c37138e09e
commit 1587dcbe89
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/text-editor-component.coffee
View File

@@ -129,7 +129,7 @@ class TextEditorComponent
updateSync: ->
@updateSyncPreMeasurement()
@oldState ?= {content: {}}
@oldState ?= {width: null}
@newState = @presenter.getPostMeasurementState()
if @editor.getLastSelection()? and not @editor.getLastSelection().isEmpty()
@@ -149,14 +149,12 @@ class TextEditorComponent
else
@domNode.style.height = ''
if (@newState.content.autoWidth isnt @oldState.content.autoWidth) or (@newState.content.width isnt @oldState.content.width)
if @newState.content.autoWidth
@hostElement.style.width = @newState.content.width + 'px'
else if @oldState.content.autoWidth
if @newState.width isnt @oldState.width
if @newState.width?
@hostElement.style.width = @newState.width + 'px'
else
@hostElement.style.width = ''
@oldState.content.width = @newState.content.width
@oldState.content.autoWidth = @newState.content.autoWidth
@oldState.width = @newState.width
if @newState.gutters.length
@mountGutterContainerComponent() unless @gutterContainerComponent?