github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-06 20:55:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid requesting horizontal measurement when auto-scrolling vertically

Browse Source 
This was leaving a measurement request in the map that was getting
picked up on the next frame. In some cases, the requested measurement
row was not present, causing an exception.
This commit is contained in:
Nathan Sobo
2017-05-04 20:14:19 -06:00
committed by Antonio Scandurra
parent 1b1973db15
commit c5c48094ba
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/text-editor-component.js
View File

@@ -311,7 +311,12 @@ class TextEditorComponent {
updateSyncBeforeMeasuringContent () {
this.derivedDimensionsCache = {}
if (this.pendingAutoscroll) this.autoscrollVertically()
if (this.pendingAutoscroll) {
const {screenRange, options} = this.pendingAutoscroll
this.autoscrollVertically(screenRange, options)
this.requestHorizontalMeasurement(screenRange.start.row, screenRange.start.column)
this.requestHorizontalMeasurement(screenRange.end.row, screenRange.end.column)
}
this.populateVisibleRowRange()
this.queryScreenLinesToRender()
this.queryLineNumbersToRender()
@@ -339,9 +344,10 @@ class TextEditorComponent {
if (this.pendingAutoscroll) {
this.derivedDimensionsCache = {}
this.autoscrollHorizontally()
const {screenRange, options} = this.pendingAutoscroll
this.autoscrollHorizontally(screenRange, options)
if (!wasHorizontalScrollbarVisible && this.isHorizontalScrollbarVisible()) {
this.autoscrollVertically()
this.autoscrollVertically(screenRange, options)
}
this.pendingAutoscroll = null
}
@@ -1860,16 +1866,11 @@ class TextEditorComponent {
}
}
autoscrollVertically () {
const {screenRange, options} = this.pendingAutoscroll
autoscrollVertically (screenRange, options) {
const screenRangeTop = this.pixelPositionAfterBlocksForRow(screenRange.start.row)
const screenRangeBottom = this.pixelPositionAfterBlocksForRow(screenRange.end.row) + this.getLineHeight()
const verticalScrollMargin = this.getVerticalAutoscrollMargin()
this.requestHorizontalMeasurement(screenRange.start.row, screenRange.start.column)
this.requestHorizontalMeasurement(screenRange.end.row, screenRange.end.column)
let desiredScrollTop, desiredScrollBottom
if (options && options.center) {
const desiredScrollCenter = (screenRangeTop + screenRangeBottom) / 2
@@ -1901,10 +1902,9 @@ class TextEditorComponent {
return false
}
autoscrollHorizontally () {
autoscrollHorizontally (screenRange, options) {
const horizontalScrollMargin = this.getHorizontalAutoscrollMargin()
const {screenRange, options} = this.pendingAutoscroll
const gutterContainerWidth = this.getGutterContainerWidth()
let left = this.pixelLeftForRowAndColumn(screenRange.start.row, screenRange.start.column) + gutterContainerWidth
let right = this.pixelLeftForRowAndColumn(screenRange.end.row, screenRange.end.column) + gutterContainerWidth