github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve DisplayLayer management

Browse Source
This commit is contained in:
Antonio Scandurra
2016-03-23 17:20:08 +01:00
parent 21831a4e43
commit 6acbbb3a5c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/display-buffer.coffee
View File

@@ -30,6 +30,7 @@ class DisplayBuffer extends Model
@deserialize: (state, atomEnvironment) ->
state.tokenizedBuffer = TokenizedBuffer.deserialize(state.tokenizedBuffer, atomEnvironment)
state.displayLayer = state.tokenizedBuffer.buffer.getDisplayLayer(state.displayLayerId)
state.config = atomEnvironment.config
state.assert = atomEnvironment.assert
state.grammarRegistry = atomEnvironment.grammars
@@ -41,7 +42,7 @@ class DisplayBuffer extends Model
{
tabLength, @editorWidthInChars, @tokenizedBuffer, buffer, @ignoreInvisibles,
@largeFileMode, @config, @assert, @grammarRegistry, @packageManager
@largeFileMode, @config, @assert, @grammarRegistry, @packageManager, @displayLayer
} = params
@emitter = new Emitter
@@ -52,7 +53,7 @@ class DisplayBuffer extends Model
@grammarRegistry, @packageManager, @assert
})
@buffer = @tokenizedBuffer.buffer
@displayLayer ?= @buffer.getDisplayLayer() ? @buffer.addDisplayLayer()
@displayLayer ?= @buffer.addDisplayLayer()
@displayLayer.setTextDecorationLayer(@tokenizedBuffer)
@charWidthsByScope = {}
@defaultMarkerLayer = @displayLayer.addMarkerLayer()
@@ -92,11 +93,12 @@ class DisplayBuffer extends Model
editorWidthInChars: @editorWidthInChars
tokenizedBuffer: @tokenizedBuffer.serialize()
largeFileMode: @largeFileMode
displayLayerId: @displayLayer.id
copy: ->
new DisplayBuffer({
@buffer, tabLength: @getTabLength(), @largeFileMode, @config, @assert,
@grammarRegistry, @packageManager, displayLayer: @displayLayer.copy()
@grammarRegistry, @packageManager, displayLayer: @buffer.copyDisplayLayer(@displayLayer.id)
})
resetDisplayLayer: ->