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

fix #325

Browse source
This commit is contained in:
Fabian Jakobs 2011-07-21 14:29:22 +02:00
commit 5a6eeab67d
5 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,9 +81,9 @@ var Marker = function(parentEl) {
range = range.toScreenRange(this.session);
if (marker.renderer) {
var top = this.$getTop(range.start.row, config);
var left = Math.round(this.$padding +
range.start.column *
config.characterWidth);
var left = Math.round(
this.$padding + range.start.column * config.characterWidth
);
marker.renderer(html, range, left, top, config);
}
else if (range.isMultiLine()) {
@ -185,15 +185,11 @@ var Marker = function(parentEl) {
);
};
<<<<<<< HEAD
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, ignorePadding) {
var padding = ignorePadding ? 0 : this.$padding;
=======
/**
* Draws a marker which covers one single full line
*/
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength) {
>>>>>>> Update desired column on insert text
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, ignorePadding) {
var padding = ignorePadding ? 0 : this.$padding;
var height = layerConfig.lineHeight;
var width = Math.round((range.end.column + (extraLength || 0) - range.start.column) * layerConfig.characterWidth);
var top = this.$getTop(range.start.row, layerConfig);