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

Merge pull request #893 from ajaxorg/hotfix/gutter

Browse source 
fix gutter width calculation
This commit is contained in:
Lennart Kats 2012-08-28 07:46:58 -07:00
commit 7c30de155e
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,11 +93,11 @@ var Gutter = function(parentEl) {
rowInfo.text.push(annoText); rowInfo.text.push(annoText);
var type = annotation.type; var type = annotation.type;
if (type == "error") if (type == "error")
rowInfo.className = "ace_error"; rowInfo.className = " ace_error";
else if (type == "warning" && rowInfo.className != "ace_error") else if (type == "warning" && rowInfo.className != " ace_error")
rowInfo.className = "ace_warning"; rowInfo.className = " ace_warning";
else if (type == "info" && (!rowInfo.className)) else if (type == "info" && (!rowInfo.className))
rowInfo.className = "ace_info"; rowInfo.className = " ace_info";
} }
} }
}; };
@ -112,6 +112,7 @@ var Gutter = function(parentEl) {
var foldWidgets = this.$showFoldWidgets && this.session.foldWidgets; var foldWidgets = this.$showFoldWidgets && this.session.foldWidgets;
var breakpoints = this.session.$breakpoints; var breakpoints = this.session.$breakpoints;
var decorations = this.session.$decorations; var decorations = this.session.$decorations;
var lastLineNumber = 0;
while (true) { while (true) {
if(i > foldStart) { if(i > foldStart) {
@ -127,7 +128,7 @@ var Gutter = function(parentEl) {
"<div class='ace_gutter-cell ", "<div class='ace_gutter-cell ",
breakpoints[i] || "", decorations[i] || "", annotation.className, breakpoints[i] || "", decorations[i] || "", annotation.className,
"' style='height:", this.session.getRowLength(i) * config.lineHeight, "px;'>", "' style='height:", this.session.getRowLength(i) * config.lineHeight, "px;'>",
i + 1 lastLineNumber = i + 1
); );
if (foldWidgets) { if (foldWidgets) {
@ -152,13 +153,14 @@ var Gutter = function(parentEl) {
this.element.style.height = config.minHeight + "px"; this.element.style.height = config.minHeight + "px";
if (this.session.$useWrapMode) if (this.session.$useWrapMode)
i = this.session.getLength(); lastLineNumber = this.session.getLength();
var gutterWidth = ("" + --i).length * config.characterWidth; var gutterWidth = ("" + lastLineNumber).length * config.characterWidth;
var padding = this.$padding || this.$computePadding(); var padding = this.$padding || this.$computePadding();
gutterWidth += padding.left + padding.right; gutterWidth += padding.left + padding.right;
if (gutterWidth !== this.gutterWidth) { if (gutterWidth !== this.gutterWidth) {
this.gutterWidth = gutterWidth; this.gutterWidth = gutterWidth;
this.element.style.width = Math.ceil(this.gutterWidth) + "px";
this._emit("changeGutterWidth", gutterWidth); this._emit("changeGutterWidth", gutterWidth);
} }
}; };