github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move movement logic to cursor subview.

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-01-23 12:50:07 -08:00
parent 98947877e5
commit 3d45a5201d
3 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/atom/editor-spec.coffee
View File

@@ -96,8 +96,8 @@ fdescribe "Editor", ->
editor.attachToDom()
editor.setPosition(row: 2, col: 2)
expect(editor.cursor.position().top).toBe(2 * editor.lineHeight())
expect(editor.cursor.position().left).toBe(2 * editor.charWidth())
expect(editor.cursor.position().top).toBe(2 * editor.lineHeight)
expect(editor.cursor.position().left).toBe(2 * editor.charWidth)
describe "when the editor is attached to the dom", ->
@@ -106,6 +106,6 @@ fdescribe "Editor", ->
editor.attachToDom()
expect(editor.cursor.position().top).toBe(2 * editor.lineHeight())
expect(editor.cursor.position().left).toBe(2 * editor.charWidth())
expect(editor.cursor.position().top).toBe(2 * editor.lineHeight)
expect(editor.cursor.position().left).toBe(2 * editor.charWidth)

36
src/atom/cursor.coffee
View File

@@ -12,6 +12,42 @@ class Cursor extends Template
getPosition: ->
@_position
moveUp: ->
{ row, col } = @getPosition()
if row is 0
col = 0
else
row--
@setPosition({row, col})
moveDown: ->
{ row, col } = @getPosition()
if row < @parentView.buffer.numLines() - 1
row++
else
col = @parentView.buffer.getLine(row).length
@setPosition({row, col})
moveRight: ->
{ row, col } = @getPosition()
if col < @parentView.buffer.getLine(row).length
col++
else if row < @parentView.buffer.numLines() - 1
row++
col = 0
@setPosition({row, col})
moveLeft: ->
{ row, col } = @getPosition()
if col > 0
col--
else if row > 0
row--
col = @parentView.buffer.getLine(row).length
@setPosition({row, col})
updateAbsolutePosition: ->
position = @parentView.toPixelPosition(@_position)
@css(position)

60
src/atom/editor.coffee
View File

@@ -33,42 +33,6 @@ class Editor extends Template
@one 'attach', =>
@calculateDimensions()
moveRight: ->
{ row, col } = @getPosition()
if col < @buffer.getLine(row).length
col++
else if row < @buffer.numLines() - 1
row++
col = 0
@setPosition({row, col})
moveDown: ->
{ row, col } = @getPosition()
if row < @buffer.numLines() - 1
row++
else
col = @buffer.getLine(row).length
@setPosition({row, col})
moveLeft: ->
{ row, col } = @getPosition()
if col > 0
col--
else if row > 0
row--
col = @buffer.getLine(row).length
@setPosition({row, col})
moveUp: ->
{ row, col } = @getPosition()
if row is 0
col = 0
else
row--
@setPosition({row, col})
setBuffer: (@buffer) ->
@lines.empty()
for line in @buffer.getLines()
@@ -78,26 +42,20 @@ class Editor extends Template
@lines.append $$.pre(line)
@setPosition(row: 0, col: 0)
setPosition: (position) ->
@cursor.setPosition(position)
getPosition: ->
@cursor.getPosition()
toPixelPosition: ({row, col}) ->
{ top: row * @lineHeight(), left: col * @charWidth() }
lineHeight: ->
@cachedLineHeight
charWidth: ->
@cachedCharWidth
{ top: row * @lineHeight, left: col * @charWidth }
calculateDimensions: ->
fragment = $('<pre style="position: absolute; visibility: hidden;">x</pre>')
@lines.append(fragment)
@cachedCharWidth = fragment.width()
@cachedLineHeight = fragment.outerHeight()
@charWidth = fragment.width()
@lineHeight = fragment.outerHeight()
fragment.remove()
@cursor.updateAbsolutePosition()
moveUp: -> @cursor.moveUp()
moveDown: -> @cursor.moveDown()
moveRight: -> @cursor.moveRight()
moveLeft: -> @cursor.moveLeft()
setPosition: (position) -> @cursor.setPosition(position)
getPosition: -> @cursor.getPosition()