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

Emit didUpdateDecorations events synchronously

Browse Source 
The rendering layer can be asynchronous instead, plus layer decorations
should remove the need to emit lots of individual events.
This commit is contained in:
Nathan Sobo
2017-03-03 05:28:21 -07:00
committed by Antonio Scandurra
parent 30cd83f7aa
commit b713210b0c
2 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/decoration-manager.js
View File

@@ -8,8 +8,6 @@ class DecorationManager {
this.displayLayer = displayLayer
this.emitter = new Emitter
this.didUpdateDecorationsEventScheduled = false
this.updatedSynchronously = false
this.decorationsById = {}
this.decorationsByMarkerId = {}
this.overlayDecorationsById = {}
@@ -35,10 +33,6 @@ class DecorationManager {
return this.emitter.on('did-update-decorations', callback)
}
setUpdatedSynchronously(updatedSynchronously) {
this.updatedSynchronously = updatedSynchronously
}
decorationForId(id) {
return this.decorationsById[id]
}
@@ -171,7 +165,7 @@ class DecorationManager {
}
this.decorationsById[decoration.id] = decoration
this.observeDecoratedLayer(marker.layer)
this.scheduleUpdateDecorationsEvent()
this.emitDidUpdateDecorations()
this.emitter.emit('did-add-decoration', decoration)
return decoration
}
@@ -186,7 +180,7 @@ class DecorationManager {
}
this.layerDecorationsByMarkerLayerId[markerLayer.id].push(decoration)
this.observeDecoratedLayer(markerLayer)
this.scheduleUpdateDecorationsEvent()
this.emitDidUpdateDecorations()
return decoration
}
@@ -194,20 +188,8 @@ class DecorationManager {
return this.decorationsByMarkerId[markerId]
}
scheduleUpdateDecorationsEvent() {
if (this.updatedSynchronously) {
this.emitter.emit('did-update-decorations')
return
}
if (!this.didUpdateDecorationsEventScheduled) {
this.didUpdateDecorationsEventScheduled = true
return process.nextTick(() => {
this.didUpdateDecorationsEventScheduled = false
return this.emitter.emit('did-update-decorations')
}
)
}
emitDidUpdateDecorations() {
this.emitter.emit('did-update-decorations')
}
decorationDidChangeType(decoration) {
@@ -234,7 +216,7 @@ class DecorationManager {
delete this.overlayDecorationsById[decoration.id]
this.unobserveDecoratedLayer(marker.layer)
}
return this.scheduleUpdateDecorationsEvent()
return this.emitDidUpdateDecorations()
}
didDestroyLayerDecoration(decoration) {
@@ -250,7 +232,7 @@ class DecorationManager {
}
this.unobserveDecoratedLayer(markerLayer)
}
return this.scheduleUpdateDecorationsEvent()
return this.emitDidUpdateDecorations()
}
observeDecoratedLayer(layer) {
@@ -258,7 +240,7 @@ class DecorationManager {
this.decorationCountsByLayerId[layer.id] = 0
}
if (++this.decorationCountsByLayerId[layer.id] === 1) {
this.layerUpdateDisposablesByLayerId[layer.id] = layer.onDidUpdate(this.scheduleUpdateDecorationsEvent.bind(this))
this.layerUpdateDisposablesByLayerId[layer.id] = layer.onDidUpdate(this.emitDidUpdateDecorations.bind(this))
}
}

4
src/decoration.coffee
View File

@@ -150,7 +150,7 @@ class Decoration
@properties = translateDecorationParamsOldToNew(newProperties)
if newProperties.type?
@decorationManager.decorationDidChangeType(this)
@decorationManager.scheduleUpdateDecorationsEvent()
@decorationManager.emitDidUpdateDecorations()
@emitter.emit 'did-change-properties', {oldProperties, newProperties}
###
@@ -175,5 +175,5 @@ class Decoration
@properties.flashCount++
@properties.flashClass = klass
@properties.flashDuration = duration
@decorationManager.scheduleUpdateDecorationsEvent()
@decorationManager.emitDidUpdateDecorations()
@emitter.emit 'did-flash'