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

Merge branch 'master' into ns-switch-to-display-layers

Browse Source 
# Conflicts:
#	spec/tokenized-buffer-spec.coffee
This commit is contained in:
Antonio Scandurra
2016-04-20 10:55:56 +02:00
parent 3bbeb9e680 1e147fbaf1
commit 754cbc2a67
12 changed files with 88 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/text-editor-presenter.coffee
View File

@@ -474,19 +474,21 @@ class TextEditorPresenter
pixelPosition = @pixelPositionForScreenPosition(screenPosition)
top = pixelPosition.top + @lineHeight
left = pixelPosition.left + @gutterWidth
# Fixed positioning.
top = @boundingClientRect.top + pixelPosition.top + @lineHeight
left = @boundingClientRect.left + pixelPosition.left + @gutterWidth
if overlayDimensions = @overlayDimensions[decoration.id]
{itemWidth, itemHeight, contentMargin} = overlayDimensions
rightDiff = left + @boundingClientRect.left + itemWidth + contentMargin - @windowWidth
rightDiff = left + itemWidth + contentMargin - @windowWidth
left -= rightDiff if rightDiff > 0
leftDiff = left + @boundingClientRect.left + contentMargin
leftDiff = left + contentMargin
left -= leftDiff if leftDiff < 0
if top + @boundingClientRect.top + itemHeight > @windowHeight and top - (itemHeight + @lineHeight) >= 0
if top + itemHeight > @windowHeight and
top - (itemHeight + @lineHeight) >= 0
top -= itemHeight + @lineHeight
pixelPosition.top = top