🐛 Fix invalid layout when adding removing a color in a line

abe33 · Jul 31, 2014 · a185707 · a185707
1 parent d748941
commit a185707
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/atom-color-highlight-view.coffee b/lib/atom-color-highlight-view.coffee
@@ -114,13 +114,18 @@ class AtomColorHighlightView extends View
  markersUpdated: (@markers) =>
  markerViewsToRemoveById = _.clone(@markerViews)
  markersByRows = {}
+ useDots = atom.config.get('atom-color-highlight.markersAtEndOfLine')
+ sortedMarkers = []
 
  for marker in @markers
  if @markerViews[marker.id]?
  delete markerViewsToRemoveById[marker.id]
+ if useDots
+ sortedMarkers.push @markerViews[marker.id]
  else
- if atom.config.get('atom-color-highlight.markersAtEndOfLine')
+ if useDots
  markerView = new DotMarkerView({@editorView, marker, markersByRows})
+ sortedMarkers.push markerView
  else
  markerView = new MarkerView({@editorView, marker})
  @append(markerView.element)
@@ -130,6 +135,14 @@ class AtomColorHighlightView extends View
  delete @markerViews[id]
  markerView.remove()
 
+ if useDots
+ markersByRows = {}
+ for markerView in sortedMarkers
+ markerView.markersByRows = markersByRows
+ markerView.updateNeeded = true
+ markerView.clearPosition = true
+ markerView.updateDisplay()
+
  rebuildMarkers: =>
  return unless @markers
  markersByRows = {}

diff --git a/lib/dot-marker-view.coffee b/lib/dot-marker-view.coffee
@@ -15,6 +15,7 @@ class DotMarkerView
  @updateNeeded = @marker.isValid()
  @oldScreenRange = @getScreenRange()
  @buffer = @editor.buffer
+ @clearPosition = true
 
  @subscribeToMarker()
  @updateDisplay()
@@ -31,7 +32,11 @@ class DotMarkerView
  size = @getSize()
  spacing = @getSpacing()
  @markersByRows[range.start.row] ?= 0
- @position ?= @markersByRows[range.start.row]
+
+ if @clearPosition
+ @position = @markersByRows[range.start.row]
+ @clearPosition = false
+
  @markersByRows[range.start.row]++
 
  color = @getColor()