Calculate gutter dimensions when editor's dimensions are calculated

dannguyen · Jun 16, 2012 · db69ee5 · db69ee5
1 parent d9500e6
commit db69ee5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
@@ -458,6 +458,15 @@ describe "Editor", ->
         rootView.setFontSize(22)
         expect(editor.css('font-size')).toBe '30px'
 
+      it "updates the gutter width and font size", ->
+        rootView.attachToDom()
+        originalFontSize = rootView.getFontSize()
+        originalGutterWidth = editor.gutter.width()
+
+        rootView.setFontSize(originalFontSize * 4)
+        expect(editor.gutter.css('font-size')).toBe "#{originalFontSize * 4}px"
+        expect(editor.gutter.width()).toBe(originalGutterWidth * 4)
+
       it "updates lines if there are unrendered lines", ->
         editor.attachToDom(heightInLines: 5)
         originalLineCount = editor.renderedLines.find(".line").length

diff --git a/src/app/editor.coffee b/src/app/editor.coffee
@@ -499,7 +499,7 @@ class Editor extends View
     rootView.on "font-size-change.editor#{@id}", => @setFontSize(rootView.getFontSize())
 
   setFontSize: (fontSize) ->
-    if fontSize
+    if fontSize?
       @css('font-size', fontSize + 'px')
       @calculateDimensions()
       @updateCursorViews()
@@ -627,6 +627,8 @@ class Editor extends View
     @height(@lineHeight) if @mini
     fragment.remove()
 
+    @gutter.calculateDimensions()
+
   prepareForScrolling: ->
     @adjustHeightOfRenderedLines()
     @adjustWidthOfRenderedLines()

diff --git a/src/app/gutter.coffee b/src/app/gutter.coffee
@@ -9,14 +9,19 @@ class Gutter extends View
     @div class: 'gutter', =>
       @div outlet: 'lineNumbers', class: 'wtf'
 
-  renderLineNumbers: (startScreenRow, endScreenRow) ->
+  editor: ->
     editor = @parentView
+
+  renderLineNumbers: (startScreenRow, endScreenRow) ->
     lastScreenRow = -1
-    rows = editor.bufferRowsForScreenRows(startScreenRow, endScreenRow)
+    rows = @editor().bufferRowsForScreenRows(startScreenRow, endScreenRow)
 
     @lineNumbers[0].innerHTML = $$$ ->
       for row in rows
         @div {class: 'line-number'}, if row == lastScreenRow then '•' else row + 1
         lastScreenRow = row
 
-    @lineNumbers.width(editor.buffer.getLastRow().toString().length * editor.charWidth)
+    @calculateDimensions()
+
+  calculateDimensions: ->
+    @lineNumbers.width(@editor().buffer.getLastRow().toString().length * @editor().charWidth)