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

Merge branch 'multiCursor'

Browse source 
Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/test/all_browser.js
This commit is contained in:
Fabian Jakobs 2012-04-12 16:03:24 +02:00
commit aed7ca654c
26 changed files with 1902 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ace/virtual_renderer.js
View file

@ -794,6 +794,19 @@ var VirtualRenderer = function(container, theme) {
// todo: handle horizontal scrolling
};
this.pixelToScreenCoordinates = function(pageX, pageY) {
var canvasPos = this.scroller.getBoundingClientRect();
var col = Math.round(
(pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
);
var row = Math.floor(
(pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
);
return {row: row, column: col};
};
this.screenToTextCoordinates = function(pageX, pageY) {
var canvasPos = this.scroller.getBoundingClientRect();
@ -885,7 +898,7 @@ var VirtualRenderer = function(container, theme) {
return afterLoad(module);
_self._loadTheme(moduleName, function() {
require([theme], function(module) {
require([moduleName], function(module) {
if (_self.$themeValue !== theme)
return;