Revert "Restore old scrolling logic"

Restoring old scrolling logic did not fix editor window scrolling bug. This reverts commit 98c0a52.
gero3 · Jun 1, 2012 · ff1e7cb · ff1e7cb
1 parent 98c0a52
commit ff1e7cb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins-client/ext.language/complete.js b/plugins-client/ext.language/complete.js
@@ -20,7 +20,7 @@ var drawCompletionBox;
 var CLASS_SELECTED = "cc_complete_option selected";
 var CLASS_UNSELECTED = "cc_complete_option";
 var MENU_WIDTH = 300;
-var MENU_SCROLL_AT = 4;
+var MENU_SHOWN_ITEMS = 8;
 
 var deferredInvoke = lang.deferredCall(function() {
     var editor = editors.currentEditor.ceEditor.$editor;
@@ -161,7 +161,7 @@ module.exports = {
         ace.container.addEventListener("mousewheel", this.closeCompletionBox);
 
         apf.popup.setContent("completionBox", barCompleterCont.$ext);
-        var boxLength = this.matches.length || 1;
+        var boxLength = Math.max(MENU_SHOWN_ITEMS, this.matches.length || 1);
         var completionBoxHeight = 11 + Math.min(10 * this.cursorConfig.lineHeight, boxLength * (this.cursorConfig.lineHeight));
         var cursorLayer = ace.renderer.$cursorLayer;
 
@@ -338,7 +338,7 @@ module.exports = {
                 if(this.selectedIdx < this.matches.length-1)
                     this.selectedIdx++;
                 this.matchEls[this.selectedIdx].className = CLASS_SELECTED;
-                if(this.selectedIdx - this.scrollIdx > MENU_SCROLL_AT) {
+                if(this.selectedIdx - this.scrollIdx > MENU_SHOWN_ITEMS) {
                     this.scrollIdx++;
                     this.matchEls[this.scrollIdx].scrollIntoView(true);
                 }
@@ -355,8 +355,8 @@ module.exports = {
                     return;
                 }
                 this.matchEls[this.selectedIdx].className = CLASS_SELECTED;
-                if(this.selectedIdx < this.matches.length - MENU_SCROLL_AT && this.scrollIdx > 0) {
-                    this.scrollIdx = this.selectedIdx - MENU_SCROLL_AT;
+                if(this.selectedIdx < this.scrollIdx) {
+                    this.scrollIdx--;
                     this.matchEls[this.scrollIdx].scrollIntoView(true);
                 }
                 e.stopPropagation();