github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-04 11:45:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Calculate pixel position of both bracket highlights before adding them

Browse Source 
Before, we were causing a layout to occur twice because we needed to
read the DOM for the pixel position of the second highlight view after
invalidating the DOM when adding the first highlight view.
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-02-14 17:30:08 -07:00
parent c3e595b040
commit 3bd98ff182
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/packages/bracket-matcher/lib/bracket-matcher.coffee
View File

@@ -50,12 +50,23 @@ module.exports =
else if previousPosition.isEqual(endPosition)
editor.setCursorBufferPosition(startPosition)
createView: (editor, bufferPosition) ->
pixelPosition = editor.pixelPositionForBufferPosition(bufferPosition)
addHighlightViews: (editor, bufferRange) ->
{ start, end } = Range.fromObject(bufferRange)
startPixelPosition = editor.pixelPositionForBufferPosition(start)
endPixelPosition = editor.pixelPositionForBufferPosition(end)
@addHighlightViewAtPixelPosition(editor, bufferPosition: start, pixelPosition: startPixelPosition)
@addHighlightViewAtPixelPosition(editor, bufferPosition: end, pixelPosition: endPixelPosition)
addHighlightViewAtPixelPosition: (editor, {bufferPosition, pixelPosition}) ->
view = $$ -> @div class: 'bracket-matcher'
view.data('bufferPosition', bufferPosition)
view.css('top', pixelPosition.top).css('left', pixelPosition.left)
view.width(editor.charWidth).height(editor.lineHeight)
view.css(
top: pixelPosition.top
left: pixelPosition.left
width: editor.charWidth
height: editor.lineHeight
)
editor.underlayer.append(view)
findCurrentPair: (editor, buffer, matches) ->
position = editor.getCursorBufferPosition()
@@ -117,12 +128,7 @@ module.exports =
matchPosition = @findMatchingStartPair(buffer, position, matchingPair, currentPair)
if position? and matchPosition?
if position.isLessThan(matchPosition)
underlayer.append(@createView(editor, position))
underlayer.append(@createView(editor, matchPosition))
else
underlayer.append(@createView(editor, matchPosition))
underlayer.append(@createView(editor, position))
@addHighlightViews(editor, [position, matchPosition])
@pairHighlighted = true
subscribeToEditSession: (editSession) ->