Commit 0342fd42 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

startTrackNewShape + mouse coords(MM)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47544 954022d7-b5bf-4e40-9824-e11837661b57
parent a715ec57
...@@ -3700,6 +3700,22 @@ function DrawingObjects() { ...@@ -3700,6 +3700,22 @@ function DrawingObjects() {
} }
} }
//-----------------------------------------------------------------------------------
// Graphic object mouse events
//-----------------------------------------------------------------------------------
_this.shapeMouseDown = function(e, x, y) {
_this.controller.onMouseDown( e, pxToMm(x), pxToMm(y) );
}
_this.shapeMouseMove = function(e, x, y) {
_this.controller.onMouseMove( e, pxToMm(x), pxToMm(y) );
}
_this.shapeMouseUp = function(e, x, y) {
_this.controller.onMouseUp( e, pxToMm(x), pxToMm(y) );
}
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Asc // Asc
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
......
...@@ -2058,6 +2058,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2058,6 +2058,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.isStartAddShape = true; this.isStartAddShape = true;
this.addShapePreset = sPreset; this.addShapePreset = sPreset;
var ws = this.wb.getWorksheet();
ws.objectRender.controller.startTrackNewShape(sPreset);
if (is_apply) { if (is_apply) {
} }
......
...@@ -655,20 +655,17 @@ ...@@ -655,20 +655,17 @@
_onShapeMouseDown: function (e, x, y) { _onShapeMouseDown: function (e, x, y) {
var ws = this.getWorksheet(); var ws = this.getWorksheet();
//console.log("_onShapeMouseDown"); ws.objectRender.shapeMouseDown(e, x, y);
ws.objectRender.controller.onMouseDown(e, x, y);
}, },
_onShapeMouseMove: function (e, x, y) { _onShapeMouseMove: function (e, x, y) {
var ws = this.getWorksheet(); var ws = this.getWorksheet();
//console.log("_onShapeMouseMove"); ws.objectRender.shapeMouseMove(e, x, y);
ws.objectRender.controller.onMouseMove(e, x, y);
}, },
_onShapeMouseUp: function (e, x, y) { _onShapeMouseUp: function (e, x, y) {
var ws = this.getWorksheet(); var ws = this.getWorksheet();
//console.log("_onShapeMouseUp"); ws.objectRender.shapeMouseUp(e, x, y);
ws.objectRender.controller.onMouseUp(e, x, y);
}, },
_onMouseDblClick: function (x, y, isHideCursor, isCoord, callback) { _onMouseDblClick: function (x, y, isHideCursor, isCoord, callback) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment