Commit c1e93539 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed problem with determining the hit of the cursor in the select in headers and shapes.

parent b0d686c3
......@@ -2236,17 +2236,17 @@ CShape.prototype.setWordShape = function (pr) {
this.bWordShape = pr;
};
CShape.prototype.selectionCheck = function (X, Y, Page_Abs, NearPos) {
CShape.prototype.selectionCheck = function (X, Y, PageAbs, NearPos) {
var content = this.getDocContent();
if (content) {
if (undefined !== NearPos)
return content.Selection_Check(X, Y, Page_Abs, NearPos);
return content.Selection_Check(X, Y, 0, NearPos);
if (isRealObject(content) && this.hitInTextRect(X, Y) && this.invertTransformText) {
var t_x = this.invertTransformText.TransformPointX(X, Y);
var t_y = this.invertTransformText.TransformPointY(X, Y);
return content.Selection_Check(t_x, t_y, Page_Abs, NearPos);
return content.Selection_Check(t_x, t_y, 0, NearPos);
}
}
return false;
......
......@@ -961,17 +961,17 @@ CHeaderFooter.prototype =
return this.Content.Selection_Is_TableBorderMove();
},
Selection_Check : function(X, Y, Page_Abs, NearPos)
{
if (-1 === this.RecalcInfo.CurPage)
return false;
Selection_Check : function(X, Y, PageAbs, NearPos)
{
if (-1 === this.RecalcInfo.CurPage)
return false;
var HdrFtrPage = this.Content.Get_StartPage_Absolute();
if ( undefined !== NearPos || HdrFtrPage === Page_Abs )
return this.Content.Selection_Check( X, Y, Page_Abs, NearPos );
var HdrFtrPage = this.Content.Get_StartPage_Absolute();
if (undefined !== NearPos || HdrFtrPage === PageAbs)
return this.Content.Selection_Check(X, Y, 0, NearPos);
return false;
},
return false;
},
// Селектим весь параграф
Select_All : function()
......@@ -2277,10 +2277,10 @@ CHeaderFooterController.prototype =
return false;
},
Selection_Check : function(X, Y, Page_Abs, NearPos)
Selection_Check : function(X, Y, PageAbs, NearPos)
{
if (null != this.CurHdrFtr)
return this.CurHdrFtr.Selection_Check(X, Y, 0, NearPos);
return this.CurHdrFtr.Selection_Check(X, Y, PageAbs, NearPos);
},
Selection_IsEmpty : function(bCheckHidden)
......
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