github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-09 22:24:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't measure lineHeight/defaultCharWidth when editor is hidden

Browse Source
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2014-05-21 17:15:47 -06:00
parent 68c3113b75
commit ee9d4ab70e
5 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lines-component.coffee
View File

@@ -35,7 +35,7 @@ LinesComponent = React.createClass
shouldComponentUpdate: (newProps) ->
return true if newProps.selectionChanged
return true unless isEqualForProperties(newProps, @props, 'renderedRowRange', 'fontSize', 'fontFamily', 'lineHeight', 'scrollTop', 'scrollLeft', 'showIndentGuide', 'scrollingVertically', 'invisibles')
return true unless isEqualForProperties(newProps, @props, 'renderedRowRange', 'fontSize', 'fontFamily', 'lineHeight', 'scrollTop', 'scrollLeft', 'showIndentGuide', 'scrollingVertically', 'invisibles', 'visible')
{renderedRowRange, pendingChanges} = newProps
for change in pendingChanges
@@ -44,7 +44,9 @@ LinesComponent = React.createClass
false
componentDidUpdate: (prevProps) ->
@measureLineHeightAndCharWidth() unless isEqualForProperties(prevProps, @props, 'fontSize', 'fontFamily', 'lineHeight')
{visible} = @props
if visible and not isEqualForProperties(prevProps, @props, 'fontSize', 'fontFamily', 'lineHeight', 'visible')
@measureLineHeightAndCharWidth()
@clearScreenRowCaches() unless prevProps.lineHeight is @props.lineHeight
@removeLineNodes() unless isEqualForProperties(prevProps, @props, 'showIndentGuide', 'invisibles')
@updateLines()