Commit c163d10b authored by Sergey Luzyanin's avatar Sergey Luzyanin

Add flag bSelected to isPointInDrawingObjects3

parent 9172dc19
...@@ -127,9 +127,9 @@ function (window, undefined) ...@@ -127,9 +127,9 @@ function (window, undefined)
{ {
return this.WB.element; return this.WB.element;
}; };
CMobileDelegateEditorCell.prototype.GetObjectTrack = function(x, y, page) CMobileDelegateEditorCell.prototype.GetObjectTrack = function(x, y, page, bSelected)
{ {
return this.WB.getWorksheet().objectRender.controller.isPointInDrawingObjects3(x, y, page); return this.WB.getWorksheet().objectRender.controller.isPointInDrawingObjects3(x, y, page, bSelected);
}; };
CMobileDelegateEditorCell.prototype.GetSelectionRectsBounds = function() CMobileDelegateEditorCell.prototype.GetSelectionRectsBounds = function()
{ {
......
...@@ -1259,7 +1259,7 @@ DrawingObjectsController.prototype = ...@@ -1259,7 +1259,7 @@ DrawingObjectsController.prototype =
isPointInDrawingObjects3: function(x, y) isPointInDrawingObjects3: function(x, y, nPageIndex, bSelected)
{ {
var oOldState = this.curState; var oOldState = this.curState;
this.changeCurrentState(new AscFormat.NullState(this)); this.changeCurrentState(new AscFormat.NullState(this));
...@@ -1270,7 +1270,8 @@ DrawingObjectsController.prototype = ...@@ -1270,7 +1270,8 @@ DrawingObjectsController.prototype =
if(AscCommon.isRealObject(oResult)){ if(AscCommon.isRealObject(oResult)){
if(oResult.cursorType !== "text"){ if(oResult.cursorType !== "text"){
var object = g_oTableId.Get_ById(oResult.objectId); var object = g_oTableId.Get_ById(oResult.objectId);
if(AscCommon.isRealObject(object) && (object.selected) ){ if(AscCommon.isRealObject(object)
&& ((bSelected && object.selected) || !bSelected) ){
bRet = true; bRet = true;
} }
else else
......
...@@ -217,9 +217,9 @@ ...@@ -217,9 +217,9 @@
{ {
this.HtmlPage.m_oApi.zoom(_value); this.HtmlPage.m_oApi.zoom(_value);
}; };
CMobileDelegateEditor.prototype.GetObjectTrack = function(x, y, page) CMobileDelegateEditor.prototype.GetObjectTrack = function(x, y, page, bSelected)
{ {
return this.LogicDocument.DrawingObjects.isPointInDrawingObjects3(x, y, page); return this.LogicDocument.DrawingObjects.isPointInDrawingObjects3(x, y, page, bSelected);
}; };
CMobileDelegateEditor.prototype.GetContextMenuType = function() CMobileDelegateEditor.prototype.GetContextMenuType = function()
{ {
......
...@@ -92,9 +92,9 @@ ...@@ -92,9 +92,9 @@
H : (this.HtmlPage.SlideScrollMAX - this.HtmlPage.SlideScrollMIN + _controlH) H : (this.HtmlPage.SlideScrollMAX - this.HtmlPage.SlideScrollMIN + _controlH)
}; };
}; };
CMobileDelegateEditorPresentation.prototype.GetObjectTrack = function(x, y, page) CMobileDelegateEditorPresentation.prototype.GetObjectTrack = function(x, y, page, bSelected)
{ {
return this.LogicDocument.Slides[this.LogicDocument.CurPage].graphicObjects.isPointInDrawingObjects3(x, y, page); return this.LogicDocument.Slides[this.LogicDocument.CurPage].graphicObjects.isPointInDrawingObjects3(x, y, page, bSelected);
}; };
CMobileDelegateEditorPresentation.prototype.GetSelectionRectsBounds = function() CMobileDelegateEditorPresentation.prototype.GetSelectionRectsBounds = function()
{ {
......
...@@ -2897,11 +2897,11 @@ CGraphicObjects.prototype = ...@@ -2897,11 +2897,11 @@ CGraphicObjects.prototype =
return this.isPointInDrawingObjects(x, y, pageIndex, bSelected, true) > -1; return this.isPointInDrawingObjects(x, y, pageIndex, bSelected, true) > -1;
}, },
isPointInDrawingObjects3: function(x, y, pageIndex) isPointInDrawingObjects3: function(x, y, pageIndex, bSelected)
{ {
var oOldState = this.curState; var oOldState = this.curState;
this.changeCurrentState(new AscFormat.NullState(this)); this.changeCurrentState(new AscFormat.NullState(this));
var bRet = this.isPointInDrawingObjects(x, y, pageIndex, true, true) > -1; var bRet = this.isPointInDrawingObjects(x, y, pageIndex, bSelected, true) > -1;
this.changeCurrentState(oOldState); this.changeCurrentState(oOldState);
return bRet; return bRet;
}, },
......
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