pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-13 08:44:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add 1 pixel to scrollWidth to account for cursor if not soft-wrapped

Browse Source
This commit is contained in:
Nathan Sobo 2015-01-19 15:20:04 -07:00
parent 2296d2d378
commit ac463143dd
2 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
spec/text-editor-presenter-spec.coffee
View File

@ -101,9 +101,9 @@ describe "TextEditorPresenter", ->
maxLineLength = editor.getMaxScreenLineLength()
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 50, scrollTop: 0, baseCharacterWidth: 10, lineHeight: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength + 1
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 10 * maxLineLength + 20, scrollTop: 0, baseCharacterWidth: 10, lineHeight: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 20
@ -249,6 +249,44 @@ describe "TextEditorPresenter", ->
expect(presenter.state.lines[line6.id]).toBeUndefined()
describe "when the ::clientWidth changes", ->
it "updates the width of the lines if it changes the ::scrollWidth", ->
line0 = editor.tokenizedLineForScreenRow(0)
line1 = editor.tokenizedLineForScreenRow(1)
line2 = editor.tokenizedLineForScreenRow(2)
maxLineLength = editor.getMaxScreenLineLength()
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 50, scrollTop: 0, scrollWidth: 70, lineHeight: 10, baseCharacterWidth: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength + 1
presenter.setClientWidth(10 * maxLineLength + 20)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 20
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength + 20
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength + 20
describe "when the ::baseCharacterWidth changes", ->
it "updates the width of the lines if it changes the ::scrollWidth", ->
line0 = editor.tokenizedLineForScreenRow(0)
line1 = editor.tokenizedLineForScreenRow(1)
line2 = editor.tokenizedLineForScreenRow(2)
maxLineLength = editor.getMaxScreenLineLength()
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 50, scrollTop: 0, scrollWidth: 70, lineHeight: 10, baseCharacterWidth: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength + 1
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength + 1
presenter.setBaseCharacterWidth(15)
expect(presenter.state.lines[line0.id].width).toBe 15 * maxLineLength + 1
expect(presenter.state.lines[line1.id].width).toBe 15 * maxLineLength + 1
expect(presenter.state.lines[line2.id].width).toBe 15 * maxLineLength + 1
describe "when the editor's content changes", ->
it "updates the lines state accordingly", ->
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, scrollTop: 10, lineHeight: 10, lineOverdrawMargin: 0)
@ -279,40 +317,11 @@ describe "TextEditorPresenter", ->
top: 10 * 3
}
describe "when the ::clientWidth changes", ->
it "updates the width of the lines if it changes the ::scrollWidth", ->
line0 = editor.tokenizedLineForScreenRow(0)
line1 = editor.tokenizedLineForScreenRow(1)
line2 = editor.tokenizedLineForScreenRow(2)
maxLineLength = editor.getMaxScreenLineLength()
describe "when ::softWrapped changes on the editor", ->
it "only accounts for the cursor width if ::softWrapped is false", ->
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 50, scrollTop: 0, scrollWidth: 70, lineHeight: 10, baseCharacterWidth: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength
presenter.setClientWidth(10 * maxLineLength + 20)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength + 20
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength + 20
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength + 20
describe "when the ::baseCharacterWidth changes", ->
it "updates the width of the lines if it changes the ::scrollWidth", ->
line0 = editor.tokenizedLineForScreenRow(0)
line1 = editor.tokenizedLineForScreenRow(1)
line2 = editor.tokenizedLineForScreenRow(2)
maxLineLength = editor.getMaxScreenLineLength()
presenter = new TextEditorPresenter(model: editor, clientHeight: 25, clientWidth: 50, scrollTop: 0, scrollWidth: 70, lineHeight: 10, baseCharacterWidth: 10, lineOverdrawMargin: 0)
expect(presenter.state.lines[line0.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line1.id].width).toBe 10 * maxLineLength
expect(presenter.state.lines[line2.id].width).toBe 10 * maxLineLength
presenter.setBaseCharacterWidth(15)
expect(presenter.state.lines[line0.id].width).toBe 15 * maxLineLength
expect(presenter.state.lines[line1.id].width).toBe 15 * maxLineLength
expect(presenter.state.lines[line2.id].width).toBe 15 * maxLineLength
expect(presenter.state.lines[editor.tokenizedLineForScreenRow(0).id].width).toBe 10 * editor.getMaxScreenLineLength() + 1
editor.setSoftWrapped(true)
expect(presenter.state.lines[editor.tokenizedLineForScreenRow(0).id].width).toBe 10 * editor.getMaxScreenLineLength()
editor.setSoftWrapped(false)
expect(presenter.state.lines[editor.tokenizedLineForScreenRow(0).id].width).toBe 10 * editor.getMaxScreenLineLength() + 1

5
src/text-editor-presenter.coffee
View File

@ -13,6 +13,7 @@ class TextEditorPresenter
subscribeToModel: ->
@disposables.add @model.onDidChange(@updateLinesState.bind(this))
@disposables.add @model.onDidChangeSoftWrapped(@updateLinesState.bind(this))
buildLinesState: ->
@state.lines = {}
@ -63,7 +64,9 @@ class TextEditorPresenter
Math.min(@model.getScreenLineCount(), endRow)
getScrollWidth: ->
Math.max(@model.getMaxScreenLineLength() * @baseCharacterWidth, @clientWidth)
contentWidth = @model.getMaxScreenLineLength() * @baseCharacterWidth
contentWidth += 1 unless @model.isSoftWrapped() # account for cursor width
Math.max(contentWidth, @clientWidth)
setScrollTop: (@scrollTop) ->
@updateLinesState()