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

fix github issue #2

Browse source
This commit is contained in:
Fabian Jakobs 2010-09-28 12:37:44 +02:00
commit 5b8ca67333
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ace/Document.js
View file

@ -47,6 +47,7 @@ var Document = function(text, mode) {
var args = [0, this.lines.length]; var args = [0, this.lines.length];
args.push.apply(args, this.$split(text)); args.push.apply(args, this.$split(text));
this.lines.splice.apply(this.lines, args); this.lines.splice.apply(this.lines, args);
this.modified = true;
this.fireChangeEvent(0); this.fireChangeEvent(0);
}; };

24
src/ace/VirtualRenderer.js
View file

@ -192,6 +192,10 @@ var VirtualRenderer = function(container) {
this.updateLines = function(firstRow, lastRow) { this.updateLines = function(firstRow, lastRow) {
var layerConfig = this.layerConfig; var layerConfig = this.layerConfig;
// if the update changes the width of the document do a full redraw
if (layerConfig.width != this.$getLongestLine())
return this.$draw(false);
if (firstRow > layerConfig.lastRow + 1) { return; } if (firstRow > layerConfig.lastRow + 1) { return; }
if (lastRow < layerConfig.firstRow) { return; } if (lastRow < layerConfig.firstRow) { return; }
@ -237,11 +241,8 @@ var VirtualRenderer = function(container) {
var offset = this.scrollTop % this.lineHeight; var offset = this.scrollTop % this.lineHeight;
var minHeight = this.scroller.clientHeight + offset; var minHeight = this.scroller.clientHeight + offset;
var charCount = this.doc.getScreenWidth(); var longestLine = this.$getLongestLine();
if (this.$showInvisibles) var widthChanged = this.layerConfig && (this.layerConfig.width != longestLine);
charCount += 1;
var longestLine = Math.max(this.scroller.clientWidth, Math.round(charCount * this.characterWidth));
var lineCount = Math.ceil(minHeight / this.lineHeight); var lineCount = Math.ceil(minHeight / this.lineHeight);
var firstRow = Math.round((this.scrollTop - offset) / this.lineHeight); var firstRow = Math.round((this.scrollTop - offset) / this.lineHeight);
@ -263,8 +264,10 @@ var VirtualRenderer = function(container) {
for ( var i = 0; i < this.layers.length; i++) { for ( var i = 0; i < this.layers.length; i++) {
var layer = this.layers[i]; var layer = this.layers[i];
var style = layer.element.style; if (widthChanged) {
style.width = longestLine + "px"; var style = layer.element.style;
style.width = longestLine + "px";
}
layer.update(layerConfig); layer.update(layerConfig);
}; };
@ -277,6 +280,13 @@ var VirtualRenderer = function(container) {
//console.log("compute+render", new Date() - start, "ms") //console.log("compute+render", new Date() - start, "ms")
}; };
this.$getLongestLine = function() {
var charCount = this.doc.getScreenWidth();
if (this.$showInvisibles)
charCount += 1;
return Math.max(this.scroller.clientWidth, Math.round(charCount * this.characterWidth));
};
this.addMarker = function(range, clazz, type) { this.addMarker = function(range, clazz, type) {
return this.$markerLayer.addMarker(range, clazz, type); return this.$markerLayer.addMarker(range, clazz, type);