Implement config observers to update minimap elements

atom-minimap · Dec 16, 2014 · 5bea545 · 5bea545
1 parent 1128bb4
commit 5bea545
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 2 deletions.
diff --git a/lib/minimap-element.coffee b/lib/minimap-element.coffee
@@ -28,6 +28,9 @@ class MinimapElement extends HTMLElement
       else if @scrollIndicator?
         @disposeScrollIndicator()
 
+    @subscriptions.add atom.config.observe 'minimap.textOpacity', (@textOpacity) =>
+      @requestForcedUpdate() if @attached
+
   attachedCallback: ->
     @domPollingIntervalId = setInterval((=> @pollDOM()), @domPollingInterval)
     @measureHeightAndWidth()
@@ -67,6 +70,8 @@ class MinimapElement extends HTMLElement
   setModel: (@minimap) ->
     @subscriptions.add @minimap.onDidChangeScrollTop => @requestUpdate()
     @subscriptions.add @minimap.onDidChangeScrollLeft => @requestUpdate()
+    @subscriptions.add @minimap.onDidChangeConfig =>
+      @requestForcedUpdate() if @attached
     @subscriptions.add @minimap.onDidChange (change) =>
       @pendingChanges.push(change)
       @requestUpdate()
@@ -142,7 +147,14 @@ class MinimapElement extends HTMLElement
       @update()
       @frameRequested = false
 
+  requestForcedUpdate: ->
+    @offscreenFirstRow = null
+    @offscreenLastRow = null
+    @requestUpdate()
+
   update: ->
+    return unless @attached
+
     @visibleArea.style.width = @clientWidth + 'px'
     @visibleArea.style.height = @minimap.getTextEditorHeight() + 'px'
     @visibleArea.style.top = (@minimap.getTextEditorScrollTop() - @minimap.getMinimapScrollTop()) + 'px'

diff --git a/lib/minimap.coffee b/lib/minimap.coffee
@@ -16,8 +16,11 @@ class Minimap extends Model
     @initializeDecorations()
 
     subs.add atom.config.observe 'minimap.charHeight', (@charHeight) =>
+      @emitter.emit('did-change-config')
     subs.add atom.config.observe 'minimap.charWidth', (@charWidth) =>
+      @emitter.emit('did-change-config')
     subs.add atom.config.observe 'minimap.interline', (@interline) =>
+      @emitter.emit('did-change-config')
 
     subs.add @textEditor.onDidChange (changes) => @emitChanges(changes)
     subs.add @textEditor.onDidChangeScrollTop (scrollTop) =>
@@ -27,6 +30,8 @@ class Minimap extends Model
 
   onDidChange: (callback) -> @emitter.on 'did-change', callback
 
+  onDidChangeConfig: (callback) -> @emitter.on 'did-change-config', callback
+
   onDidChangeScrollTop: (callback) ->
     @emitter.on 'did-change-scroll-top', callback
 

diff --git a/lib/mixins/canvas-drawer.coffee b/lib/mixins/canvas-drawer.coffee
@@ -40,7 +40,7 @@ class CanvasDrawer extends Mixin
   #    ##    ## ##     ## ##       ##     ## ##    ##  ##    ##
   #     ######   #######  ########  #######  ##     ##  ######
 
-  getTextOpacity: -> 0.6
+  getTextOpacity: -> @textOpacity
 
   # Returns the default text color for an editor content.
   #

diff --git a/spec/minimap-element-spec.coffee b/spec/minimap-element-spec.coffee
@@ -14,6 +14,7 @@ describe 'MinimapElement', ->
     atom.config.set 'minimap.charHeight', 4
     atom.config.set 'minimap.charWidth', 2
     atom.config.set 'minimap.interline', 1
+    atom.config.set 'minimap.textOpacity', 1
 
     MinimapElement.registerViewProvider()
 
@@ -221,13 +222,48 @@ describe 'MinimapElement', ->
     #    ##    ## ##     ## ##   ### ##        ##  ##    ##
     #     ######   #######  ##    ## ##       ####  ######
 
+    describe 'when minimap.textOpacity is changed', ->
+      beforeEach ->
+        spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
+        atom.config.set 'minimap.textOpacity', 0.3
+        nextAnimationFrame()
+
+      it 'requests a complete update', ->
+        expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+
+    describe 'when minimap.charWidth is changed', ->
+      beforeEach ->
+        spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
+        atom.config.set 'minimap.charWidth', 1
+        nextAnimationFrame()
+
+      it 'requests a complete update', ->
+        expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+
+    describe 'when minimap.charHeight is changed', ->
+      beforeEach ->
+        spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
+        atom.config.set 'minimap.charHeight', 1
+        nextAnimationFrame()
+
+      it 'requests a complete update', ->
+        expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+
+    describe 'when minimap.interline is changed', ->
+      beforeEach ->
+        spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
+        atom.config.set 'minimap.interline', 2
+        nextAnimationFrame()
+
+      it 'requests a complete update', ->
+        expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+
     describe 'when minimap.displayMinimapOnLeft setting is true', ->
       beforeEach ->
         atom.config.set 'minimap.displayMinimapOnLeft', true
 
       it 'moves the attached minimap to the left', ->
         expect(Array::indexOf.call(editorElement.shadowRoot.children, minimapElement)).toEqual(0)
-        nextAnimationFrame()
 
     describe 'when minimap.minimapScrollIndicator setting is true', ->
       beforeEach ->