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

when text is wrapped highlight full gutter row and screen row

Browse source
This commit is contained in:
nightwing 2013-02-04 18:34:40 +04:00
commit 3cbb8dda55
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/edit_session.js
View file

@ -717,9 +717,7 @@ var EditSession = function(text, mode) {
clazz = "ace_step"; clazz = "ace_step";
var range = new Range(startRow, 0, endRow, Infinity); var range = new Range(startRow, 0, endRow, Infinity);
range.id = this.addMarker(range, clazz, "fullLine", inFront);
var id = this.addMarker(range, clazz, "fullLine", inFront);
range.id = id;
return range; return range;
}; };

5
lib/ace/editor.js
View file

@ -507,10 +507,13 @@ var Editor = function(renderer, session) {
session.removeMarker(session.$highlightLineMarker.id); session.removeMarker(session.$highlightLineMarker.id);
session.$highlightLineMarker = null; session.$highlightLineMarker = null;
} else if (!session.$highlightLineMarker && highlight) { } else if (!session.$highlightLineMarker && highlight) {
session.$highlightLineMarker = session.highlightLines(highlight.row, highlight.row, "ace_active-line"); var range = new Range(highlight.row, highlight.column, highlight.row, Infinity);
range.id = session.addMarker(range, "ace_active-line", "screenLine");
session.$highlightLineMarker = range;
} else if (highlight) { } else if (highlight) {
session.$highlightLineMarker.start.row = highlight.row; session.$highlightLineMarker.start.row = highlight.row;
session.$highlightLineMarker.end.row = highlight.row; session.$highlightLineMarker.end.row = highlight.row;
session.$highlightLineMarker.start.column = highlight.column;
session._emit("changeBackMarker"); session._emit("changeBackMarker");
} }
}; };

16
lib/ace/layer/marker.js
View file

@ -82,6 +82,8 @@ var Marker = function(parentEl) {
marker.renderer(html, range, left, top, config); marker.renderer(html, range, left, top, config);
} else if (marker.type == "fullLine") { } else if (marker.type == "fullLine") {
this.drawFullLineMarker(html, range, marker.clazz, config); this.drawFullLineMarker(html, range, marker.clazz, config);
} else if (marker.type == "screenLine") {
this.drawScreenLineMarker(html, range, marker.clazz, config);
} else if (range.isMultiLine()) { } else if (range.isMultiLine()) {
if (marker.type == "text") if (marker.type == "text")
this.drawTextMarker(html, range, marker.clazz, config); this.drawTextMarker(html, range, marker.clazz, config);
@ -194,7 +196,19 @@ var Marker = function(parentEl) {
"top:", top, "px;", "top:", top, "px;",
"left:0;right:0;'></div>" "left:0;right:0;'></div>"
); );
} };
this.drawScreenLineMarker = function(stringBuilder, range, clazz, config) {
var top = this.$getTop(range.start.row, config);
var height = config.lineHeight;
stringBuilder.push(
"<div class='", clazz, "' style='",
"height:", height, "px;",
"top:", top, "px;",
"left:0;right:0;'></div>"
);
};
}).call(Marker.prototype); }).call(Marker.prototype);

12
lib/ace/virtual_renderer.js
View file

@ -465,8 +465,16 @@ var VirtualRenderer = function(container, theme) {
}; };
this.$updateGutterLineHighlight = function() { this.$updateGutterLineHighlight = function() {
this.$gutterLineHighlight.style.top = this.$cursorLayer.$pixelPos.top - this.layerConfig.offset + "px"; var pos = this.$cursorLayer.$pixelPos;
this.$gutterLineHighlight.style.height = this.layerConfig.lineHeight + "px"; var height = this.layerConfig.lineHeight;
if (this.session.getUseWrapMode()) {
var cursor = this.session.selection.getCursor();
cursor.column = 0;
pos = this.$cursorLayer.getPixelPosition(cursor, true);
height *= this.session.getRowLength(cursor.row);
}
this.$gutterLineHighlight.style.top = pos.top - this.layerConfig.offset + "px";
this.$gutterLineHighlight.style.height = height + "px";
}; };
this.$updatePrintMargin = function() { this.$updatePrintMargin = function() {