Set back up highlight mark.
This commit is contained in:
parent
2505f50eec
commit
f21083acf5
2 changed files with 6 additions and 4 deletions
app/lib/surface
|
@ -594,10 +594,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
|
||||||
@marks[effects[@effectIndex]].show()
|
@marks[effects[@effectIndex]].show()
|
||||||
|
|
||||||
setHighlight: (to, delay) ->
|
setHighlight: (to, delay) ->
|
||||||
# TODO: get highlights working again
|
@addMark 'highlight', @options.floatingLayer, 'highlight' if to
|
||||||
# @addMark 'highlight', @options.floatingLayer, 'highlight' if to
|
@marks.highlight?.highlightDelay = delay
|
||||||
# @marks.highlight?.highlightDelay = delay
|
@marks.highlight?.toggle to and not @dimmed
|
||||||
# @marks.highlight?.toggle to and not @dimmed
|
|
||||||
|
|
||||||
setDimmed: (@dimmed) ->
|
setDimmed: (@dimmed) ->
|
||||||
@marks.highlight?.toggle @marks.highlight.on and not @dimmed
|
@marks.highlight?.toggle @marks.highlight.on and not @dimmed
|
||||||
|
|
|
@ -143,6 +143,9 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
|
||||||
#- Adding, removing children for WebGL layers.
|
#- Adding, removing children for WebGL layers.
|
||||||
|
|
||||||
addCocoSprite: (cocoSprite) ->
|
addCocoSprite: (cocoSprite) ->
|
||||||
|
# TODO: Move this into the production DB rather than setting it dynamically.
|
||||||
|
if cocoSprite.thangType?.get('name') is 'Highlight'
|
||||||
|
cocoSprite.thangType.set('spriteType', 'segmented')
|
||||||
cocoSprite.options.resolutionFactor = @resolutionFactor
|
cocoSprite.options.resolutionFactor = @resolutionFactor
|
||||||
if cocoSprite.layer
|
if cocoSprite.layer
|
||||||
console.warn 'CocoSprite being re-added to a layer?'
|
console.warn 'CocoSprite being re-added to a layer?'
|
||||||
|
|
Reference in a new issue