jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix regression with horizontal scrolling

Browse source
This commit is contained in:
nightwing 2011-12-18 19:03:09 +04:00
commit 00bc66fd9a
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/virtual_renderer.js
View file

@ -646,12 +646,14 @@ var VirtualRenderer = function(container, theme) {
var scrollLeft = this.scroller.scrollLeft; var scrollLeft = this.scroller.scrollLeft;
if (scrollLeft > left) { if (scrollLeft > left) {
if (left < this.$padding + 2 * this.layerConfig.characterWidth)
left = 0;
this.scrollToX(left); this.scrollToX(left);
} }
if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) { if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
if (left > this.layerConfig.width) if (left > this.layerConfig.width + 2 * this.$padding)
this.$desiredScrollLeft = left + 2 * this.characterWidth; this.$desiredScrollLeft = left;
else else
this.scrollToX(Math.round(left + this.characterWidth - this.$size.scrollerWidth)); this.scrollToX(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
} }
@ -701,7 +703,7 @@ var VirtualRenderer = function(container, theme) {
}; };
this.scrollToX = function(scrollLeft) { this.scrollToX = function(scrollLeft) {
if (scrollLeft <= this.$padding + 2 * this.layerConfig.characterWidth) if (scrollLeft <= this.$padding)
scrollLeft = 0; scrollLeft = 0;
this.scroller.scrollLeft = scrollLeft; this.scroller.scrollLeft = scrollLeft;