github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change state.content.width based on autoWidth

Browse Source
This commit is contained in:
Antonio Scandurra
2016-08-17 16:14:57 +02:00
parent 683bf37907
commit 2e37d7f0cf
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2664,6 +2664,39 @@ describe "TextEditorPresenter", ->
pixelPosition: {top: 10, left: 0}
}
describe ".width", ->
describe "when `editor.autoWidth` is false (the default)", ->
it "equals to the max width between the content frame width and the content width + the vertical scrollbar width", ->
editor.setText('abc\ndef\nghi\njkl')
presenter = buildPresenter(explicitHeight: 10, contentFrameWidth: 33, verticalScrollbarWidth: 7, baseCharacterWidth: 10)
expect(getState(presenter).content.width).toBe(3 * 10 + 7 + 1)
presenter.setContentFrameWidth(50)
expect(getState(presenter).content.width).toBe(50)
presenter.setVerticalScrollbarWidth(27)
expect(getState(presenter).content.width).toBe(3 * 10 + 27 + 1)
describe "when `editor.autoWidth` is true", ->
it "equals to the width of the content + the vertical scrollbar width", ->
editor.setText('abc\ndef\nghi\njkl')
presenter = buildPresenter(explicitHeight: 10, contentFrameWidth: 300, verticalScrollbarWidth: 7, baseCharacterWidth: 10)
expectStateUpdate presenter, -> editor.update({autoWidth: true})
expect(getState(presenter).content.width).toBe(3 * 10 + 7 + 1)
editor.setText('abcdefghi\n')
expect(getState(presenter).content.width).toBe(9 * 10 + 7 + 1)
it "ignores the vertical scrollbar width when it is unset", ->
editor.setText('abcdef\nghijkl')
presenter = buildPresenter(explicitHeight: 10, contentFrameWidth: 33, verticalScrollbarWidth: 7, baseCharacterWidth: 10)
presenter.setVerticalScrollbarWidth(null)
expect(getState(presenter).content.width).toBe(6 * 10 + 1)
it "ignores the content frame width when it is unset", ->
editor.setText('abc\ndef\nghi\njkl')
presenter = buildPresenter(explicitHeight: 10, contentFrameWidth: 33, verticalScrollbarWidth: 7, baseCharacterWidth: 10)
getState(presenter) # trigger a state update, causing verticalScrollbarWidth to be stored in the presenter
presenter.setContentFrameWidth(null)
expect(getState(presenter).content.width).toBe(3 * 10 + 7 + 1)
describe ".height", ->
it "updates model's rows per page when it changes", ->
presenter = buildPresenter(explicitHeight: 50, lineHeightInPixels: 10, horizontalScrollbarHeight: 10)

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

@@ -269,7 +269,14 @@ class TextEditorPresenter
@sharedGutterStyles.maxHeight = @boundingClientRect.height
@state.content.maxHeight = @boundingClientRect.height
@state.content.width = Math.max(@contentWidth + @verticalScrollbarWidth, @contentFrameWidth)
verticalScrollbarWidth = @verticalScrollbarWidth ? 0
contentFrameWidth = @contentFrameWidth ? 0
contentWidth = @contentWidth ? 0
if @model.getAutoWidth()
@state.content.width = contentWidth + verticalScrollbarWidth
else
@state.content.width = Math.max(contentWidth + verticalScrollbarWidth, contentFrameWidth)
@state.content.autoWidth = @model.getAutoWidth()
@state.content.scrollWidth = @scrollWidth
@state.content.scrollLeft = @scrollLeft
@state.content.backgroundColor = if @model.isMini() then null else @backgroundColor