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

Merge branch 'master' into atom-textarea

Browse Source
This commit is contained in:
joshaber
2016-02-25 16:05:59 -05:00
parent dd83619c45 829ba67462
commit 1b6325494d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -112,7 +112,7 @@
"symbols-view": "0.111.1",
"tabs": "0.90.2",
"timecop": "0.33.1",
"tree-view": "0.201.3",
"tree-view": "0.201.4",
"update-package-dependencies": "0.10.0",
"welcome": "0.34.0",
"whitespace": "0.32.2",

4
src/text-editor.coffee
View File

@@ -3232,7 +3232,7 @@ class TextEditor extends Model
# top of the visible area.
setFirstVisibleScreenRow: (screenRow, fromView) ->
unless fromView
maxScreenRow = @getLineCount() - 1
maxScreenRow = @getScreenLineCount() - 1
unless @config.get('editor.scrollPastEnd')
height = @displayBuffer.getHeight()
lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
@@ -3250,7 +3250,7 @@ class TextEditor extends Model
height = @displayBuffer.getHeight()
lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
if height? and lineHeightInPixels?
Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getLineCount() - 1)
Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getScreenLineCount() - 1)
else
null