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

fix scrolling error widget into view

Browse source
This commit is contained in:
nightwing 2014-01-30 21:23:04 +04:00
commit 36c6fcc9d4
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/ext/error_marker.js
View file

@ -171,6 +171,8 @@ exports.showErrorMarker = function(editor, dir) {
editor.session.widgetManager.addLineWidget(w); editor.session.widgetManager.addLineWidget(w);
w.el.onmousedown = editor.focus.bind(editor); w.el.onmousedown = editor.focus.bind(editor);
editor.renderer.scrollCursorIntoView(null, 0.5, {bottom: w.el.offsetHeight});
}; };

15
lib/ace/virtual_renderer.js
View file

@ -1114,7 +1114,7 @@ var VirtualRenderer = function(container, theme) {
* *
* Scrolls the cursor into the first visibile area of the editor * Scrolls the cursor into the first visibile area of the editor
**/ **/
this.scrollCursorIntoView = function(cursor, offset) { this.scrollCursorIntoView = function(cursor, offset, $viewMargin) {
// the editor is not visible // the editor is not visible
if (this.$size.scrollerHeight === 0) if (this.$size.scrollerHeight === 0)
return; return;
@ -1124,17 +1124,18 @@ var VirtualRenderer = function(container, theme) {
var left = pos.left; var left = pos.left;
var top = pos.top; var top = pos.top;
var topMargin = $viewMargin && $viewMargin.top || 0;
var bottomMargin = $viewMargin && $viewMargin.bottom || 0;
var scrollTop = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop; var scrollTop = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop;
if (scrollTop > top) { if (scrollTop + topMargin > top) {
if (offset) if (offset)
top -= offset * this.$size.scrollerHeight; top -= offset * this.$size.scrollerHeight;
if (top == 0) if (top === 0)
top = - this.scrollMargin.top; top = -this.scrollMargin.top;
else if (top == 0)
top = + this.scrollMargin.bottom;
this.session.setScrollTop(top); this.session.setScrollTop(top);
} else if (scrollTop + this.$size.scrollerHeight < top + this.lineHeight) { } else if (scrollTop + this.$size.scrollerHeight - bottomMargin < top + this.lineHeight) {
if (offset) if (offset)
top += offset * this.$size.scrollerHeight; top += offset * this.$size.scrollerHeight;
this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight); this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);