🐛 Fix position of the quick settings view when minimap is on left

atom-minimap · Feb 11, 2015 · 0d45445 · 0d45445
1 parent 6434c34
commit 0d45445
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/lib/minimap-element.coffee b/lib/minimap-element.coffee
@@ -186,9 +186,13 @@ class MinimapElement extends HTMLElement
             @quickSettingsElement = null
 
           @quickSettingsElement.attach()
-          {top, left} = @getBoundingClientRect()
+          {top, left, right} = @getBoundingClientRect()
           @quickSettingsElement.style.top = top + 'px'
-          @quickSettingsElement.style.left = (left - @quickSettingsElement.clientWidth) + 'px'
+
+          if @displayMinimapOnLeft
+            @quickSettingsElement.style.left = (right) + 'px'
+          else
+            @quickSettingsElement.style.left = (left - @quickSettingsElement.clientWidth) + 'px'
 
   disposeOpenQuickSettings: ->
     return unless @openQuickSettings?

diff --git a/spec/minimap-element-spec.coffee b/spec/minimap-element-spec.coffee
@@ -672,6 +672,29 @@ describe 'MinimapElement', ->
           expect(realOffsetTop(quickSettingsElement)).toBeCloseTo(minimapBounds.top, 0)
           expect(realOffsetLeft(quickSettingsElement)).toBeCloseTo(minimapBounds.left - settingsBounds.width, 0)
 
+      describe 'when the displayMinimapOnLeft setting is enabled', ->
+        describe 'clicking on the div', ->
+          beforeEach ->
+            atom.config.set('minimap.displayMinimapOnLeft', true)
+
+            workspaceElement = atom.views.getView(atom.workspace)
+            jasmineContent.appendChild(workspaceElement)
+
+            openQuickSettings = minimapElement.shadowRoot.querySelector('.open-minimap-quick-settings')
+            mousedown(openQuickSettings)
+
+            quickSettingsElement = workspaceElement.querySelector('minimap-quick-settings')
+
+          afterEach ->
+            minimapElement.quickSettingsElement.destroy()
+
+          it 'positions the quick settings view next to the minimap', ->
+            minimapBounds = minimapElement.getBoundingClientRect()
+            settingsBounds = quickSettingsElement.getBoundingClientRect()
+
+            expect(realOffsetTop(quickSettingsElement)).toBeCloseTo(minimapBounds.top, 0)
+            expect(realOffsetLeft(quickSettingsElement)).toBeCloseTo(minimapBounds.right, 0)
+
       describe 'when the quick settings view is open', ->
         beforeEach ->
           workspaceElement = atom.views.getView(atom.workspace)