From 00bc66fd9ac76b5bbd09b9e0b2d953a5847bc537 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 18 Dec 2011 19:03:09 +0400
Subject: [PATCH] fix regression with horizontal scrolling

---
 lib/ace/virtual_renderer.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 536096b1..ac72835e 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -646,12 +646,14 @@ var VirtualRenderer = function(container, theme) {
         var scrollLeft = this.scroller.scrollLeft;
 
         if (scrollLeft > left) {
+            if (left < this.$padding + 2 * this.layerConfig.characterWidth)
+                left = 0;
             this.scrollToX(left);
         }
 
         if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
-            if (left > this.layerConfig.width)
-                this.$desiredScrollLeft = left + 2 * this.characterWidth;
+            if (left > this.layerConfig.width + 2 * this.$padding)
+                this.$desiredScrollLeft = left;
             else
                 this.scrollToX(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
         }
@@ -701,7 +703,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     this.scrollToX = function(scrollLeft) {
-        if (scrollLeft <= this.$padding + 2 * this.layerConfig.characterWidth)
+        if (scrollLeft <= this.$padding)
             scrollLeft = 0;
 
         this.scroller.scrollLeft = scrollLeft;