Properly measure the width of a line when a range widget is at its end

codemirror · Feb 1, 2013 · 8f63800 · 8f63800
1 parent 0bebb4f
commit 8f63800
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -1026,6 +1026,9 @@ window.CodeMirror = (function() {
       var vr = cur.top;
       cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
     }
+    if (!cm.options.lineWrapping)
+      data.width = pre.lastChild.getBoundingClientRect().right - outer.left;
+
     return data;
   }
 
@@ -1221,7 +1224,7 @@ window.CodeMirror = (function() {
     var display = cm.display;
     if (op.updateMaxLine) computeMaxLength(cm);
     if (cm.display.maxLineChanged && !cm.options.lineWrapping) {
-      var width = measureChar(cm, cm.display.maxLine, cm.display.maxLine.text.length).right;
+      var width = measureLine(cm, cm.display.maxLine).width;
       display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + "px";
       cm.display.maxLineChanged = false;
       var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);