Skip to content

S
sdkjs
Commit b57ecbf7 authored by alexey.musinov's avatar alexey.musinov
Browse files
Options

[mobile] word select text

parent 67b11d9e
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 98 deletions
common/Native/Wrappers/DrawingDocument.js
View file @ b57ecbf7
...@@ -626,6 +626,9 @@ CDrawingDocument.prototype = ...@@ -626,6 +626,9 @@ CDrawingDocument.prototype =
this.m_oApi.DocumentUrl = ""; this.m_oApi.DocumentUrl = "";
this.LogicDocument = window.editor.WordControl.m_oLogicDocument; this.LogicDocument = window.editor.WordControl.m_oLogicDocument;
this.LogicDocument.DrawingDocument = this; this.LogicDocument.DrawingDocument = this;
this.selectionMatrix = null;
this.isSelectionMatrix = false;
}, },
RenderPage : function(nPageIndex) RenderPage : function(nPageIndex)
{ {
...@@ -781,11 +784,11 @@ CDrawingDocument.prototype = ...@@ -781,11 +784,11 @@ CDrawingDocument.prototype =
this.Native["DD_UpdateTargetTransform"](matrix.sx, matrix.shy, matrix.shx, matrix.sy, matrix.tx, matrix.ty); this.Native["DD_UpdateTargetTransform"](matrix.sx, matrix.shy, matrix.shx, matrix.sy, matrix.tx, matrix.ty);
} }
//else else
//{ {
// this.TextMatrix = null; this.TextMatrix = null;
// this.Native["DD_RemoveTargetTransform"](); this.Native["DD_RemoveTargetTransform"]();
//} }
}, },
UpdateTarget : function(x, y, pageIndex) UpdateTarget : function(x, y, pageIndex)
{ {
...@@ -900,6 +903,7 @@ CDrawingDocument.prototype = ...@@ -900,6 +903,7 @@ CDrawingDocument.prototype =
}, },
AddPageSelection : function(pageIndex, x, y, w, h) AddPageSelection : function(pageIndex, x, y, w, h)
{ {
this.selectionMatrix = this.TextMatrix;
this.Native["DD_AddPageSelection"](pageIndex, x, y, w, h); this.Native["DD_AddPageSelection"](pageIndex, x, y, w, h);
}, },
OnSelectEnd : function() OnSelectEnd : function()
...@@ -1329,6 +1333,8 @@ CDrawingDocument.prototype = ...@@ -1329,6 +1333,8 @@ CDrawingDocument.prototype =
}, },
OnUpdateOverlay : function() OnUpdateOverlay : function()
{ {
isSelectionMatrix = false;
if (this.IsUpdateOverlayOnlyEnd) if (this.IsUpdateOverlayOnlyEnd)
{ {
this.IsUpdateOverlayOnEndCheck = true; this.IsUpdateOverlayOnEndCheck = true;
...@@ -1455,6 +1461,8 @@ CDrawingDocument.prototype = ...@@ -1455,6 +1461,8 @@ CDrawingDocument.prototype =
// 1 - select markers // 1 - select markers
// 2 - drawing track // 2 - drawing track
var matrixCheck = this.selectionMatrix; // this.TextMatrix
check_MouseDownEvent(e, false); check_MouseDownEvent(e, false);
var pos = null; var pos = null;
...@@ -1480,7 +1488,7 @@ CDrawingDocument.prototype = ...@@ -1480,7 +1488,7 @@ CDrawingDocument.prototype =
var _circlePos2_x = 0; var _circlePos2_x = 0;
var _circlePos2_y = 0; var _circlePos2_y = 0;
if (!this.TextMatrix) if (!matrixCheck)
{ {
_circlePos1_x = this.SelectRect1.X; _circlePos1_x = this.SelectRect1.X;
_circlePos1_y = this.SelectRect1.Y - radiusMM; _circlePos1_y = this.SelectRect1.Y - radiusMM;
...@@ -1496,10 +1504,10 @@ CDrawingDocument.prototype = ...@@ -1496,10 +1504,10 @@ CDrawingDocument.prototype =
var _circlePos2_x_mem = this.SelectRect2.X + this.SelectRect2.W; var _circlePos2_x_mem = this.SelectRect2.X + this.SelectRect2.W;
var _circlePos2_y_mem = this.SelectRect2.Y + this.SelectRect2.H + radiusMM; var _circlePos2_y_mem = this.SelectRect2.Y + this.SelectRect2.H + radiusMM;
_circlePos1_x = this.TextMatrix.TransformPointX(_circlePos1_x_mem, _circlePos1_y_mem); _circlePos1_x = matrixCheck.TransformPointX(_circlePos1_x_mem, _circlePos1_y_mem);
_circlePos1_y = this.TextMatrix.TransformPointY(_circlePos1_x_mem, _circlePos1_y_mem); _circlePos1_y = matrixCheck.TransformPointY(_circlePos1_x_mem, _circlePos1_y_mem);
_circlePos2_x = this.TextMatrix.TransformPointX(_circlePos2_x_mem, _circlePos2_y_mem); _circlePos2_x = matrixCheck.TransformPointX(_circlePos2_x_mem, _circlePos2_y_mem);
_circlePos2_y = this.TextMatrix.TransformPointY(_circlePos2_x_mem, _circlePos2_y_mem); _circlePos2_y = matrixCheck.TransformPointY(_circlePos2_x_mem, _circlePos2_y_mem);
} }
var _selectCircleEpsMM = 10; // 1cm; var _selectCircleEpsMM = 10; // 1cm;
...@@ -1519,43 +1527,12 @@ CDrawingDocument.prototype = ...@@ -1519,43 +1527,12 @@ CDrawingDocument.prototype =
this.SelectDrag = 1; this.SelectDrag = 1;
this.LogicDocument.Cursor_MoveRight(); this.LogicDocument.Cursor_MoveRight();
/*
это старая версия. грамотная реализация - моус даун и ап с шифтом. Так и проще и правильнее
var _xDown = this.SelectRect2.X + this.SelectRect2.W;
var _yDown = this.SelectRect2.Y + this.SelectRect2.H / 2;
if (!this.TextMatrix)
{
this.LogicDocumentOnMouseDown(global_mouseEvent, _xDown, _yDown, this.SelectRect2.Page);
}
else
{
this.LogicDocumentOnMouseDown(global_mouseEvent, this.TextMatrix.TransformPointX(_xDown, _yDown),
this.TextMatrix.TransformPointY(_xDown, _yDown), this.SelectRect2.Page);
}
//теперь сдвиги
var _xStamp = this.SelectRect1.X;
var _yStamp = this.SelectRect1.Y;
if (this.TextMatrix)
{
_xStamp = this.TextMatrix.TransformPointX(this.SelectRect1.X, this.SelectRect1.Y);
_yStamp = this.TextMatrix.TransformPointY(this.SelectRect1.X, this.SelectRect1.Y);
}
var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect1.Page);
var ret2 = this.CorrectMouseSelectPosition(Math.min(this.SelectMobileConstantOffsetEpsilon, this.SelectRect1.H / 2));
this.SelectMobileXOffset = (ret.X + ret2.X) - global_mouseEvent.X;
this.SelectMobileYOffset = (ret.Y + ret2.Y) - global_mouseEvent.Y;
this.OnMouseMove(e);
*/
var _xStamp = this.SelectRect1.X; var _xStamp = this.SelectRect1.X;
var _yStamp = this.SelectRect1.Y; var _yStamp = this.SelectRect1.Y;
if (this.TextMatrix) if (matrixCheck)
{ {
_xStamp = this.TextMatrix.TransformPointX(this.SelectRect1.X, this.SelectRect1.Y); _xStamp = matrixCheck.TransformPointX(this.SelectRect1.X, this.SelectRect1.Y);
_yStamp = this.TextMatrix.TransformPointY(this.SelectRect1.X, this.SelectRect1.Y); _yStamp = matrixCheck.TransformPointY(this.SelectRect1.X, this.SelectRect1.Y);
} }
var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect1.Page); var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect1.Page);
...@@ -1582,45 +1559,13 @@ CDrawingDocument.prototype = ...@@ -1582,45 +1559,13 @@ CDrawingDocument.prototype =
this.SelectDrag = 2; this.SelectDrag = 2;
this.LogicDocument.Cursor_MoveLeft(); this.LogicDocument.Cursor_MoveLeft();
/*
это старая версия. грамотная реализация - моус даун и ап с шифтом. Так и проще и правильнее
var _xDown = this.SelectRect1.X;
var _yDown = this.SelectRect1.Y + this.SelectRect1.H / 2;
if (!this.TextMatrix)
{
this.LogicDocumentOnMouseDown(global_mouseEvent, _xDown, _yDown, this.SelectRect1.Page);
}
else
{
this.LogicDocumentOnMouseDown(global_mouseEvent, this.TextMatrix.TransformPointX(_xDown, _yDown),
this.TextMatrix.TransformPointY(_xDown, _yDown), this.SelectRect1.Page);
}
//теперь сдвиги
var _xStamp = this.SelectRect2.X + this.SelectRect2.W;
var _yStamp = this.SelectRect2.Y + this.SelectRect2.H;
if (this.TextMatrix)
{
var _xTmp = _xStamp;
_xStamp = this.TextMatrix.TransformPointX(_xTmp, _yStamp);
_yStamp = this.TextMatrix.TransformPointY(_xTmp, _yStamp);
}
var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect2.Page);
var ret2 = this.CorrectMouseSelectPosition(Math.min(this.SelectMobileConstantOffsetEpsilon, this.SelectRect2.H / 2));
this.SelectMobileXOffset = (ret.X - ret2.X) - global_mouseEvent.X;
this.SelectMobileYOffset = (ret.Y - ret2.Y) - global_mouseEvent.Y;
this.OnMouseMove(e);
*/
var _xStamp = this.SelectRect2.X + this.SelectRect2.W; var _xStamp = this.SelectRect2.X + this.SelectRect2.W;
var _yStamp = this.SelectRect2.Y + this.SelectRect2.H; var _yStamp = this.SelectRect2.Y + this.SelectRect2.H;
if (this.TextMatrix) if (matrixCheck)
{ {
var _xTmp = _xStamp; var _xTmp = _xStamp;
_xStamp = this.TextMatrix.TransformPointX(_xTmp, _yStamp); _xStamp = matrixCheck.TransformPointX(_xTmp, _yStamp);
_yStamp = this.TextMatrix.TransformPointY(_xTmp, _yStamp); _yStamp = matrixCheck.TransformPointY(_xTmp, _yStamp);
} }
var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect2.Page); var ret = this.__DD_ConvertCoordsToCursor(_xStamp, _yStamp, this.SelectRect2.Page);
...@@ -1859,12 +1804,12 @@ CDrawingDocument.prototype = ...@@ -1859,12 +1804,12 @@ CDrawingDocument.prototype =
var xOff = 0; var xOff = 0;
var yOff = 1; var yOff = 1;
if (null != this.TextMatrix) if (null != this.selectionMatrix)
{ {
var xOff1 = this.TextMatrix.TransformPointX(0, 0); var xOff1 = this.selectionMatrix.TransformPointX(0, 0);
var yOff1 = this.TextMatrix.TransformPointY(0, 0); var yOff1 = this.selectionMatrix.TransformPointY(0, 0);
var xOff2 = this.TextMatrix.TransformPointX(0, 1); var xOff2 = this.selectionMatrix.TransformPointX(0, 1);
var yOff2 = this.TextMatrix.TransformPointY(0, 1); var yOff2 = this.selectionMatrix.TransformPointY(0, 1);
// по идее скэйла нет. но на всякий // по идее скэйла нет. но на всякий
var _len = Math.sqrt((xOff1 - xOff2) * (xOff1 - xOff2) + (yOff1 - yOff2) * (yOff1 - yOff2)); var _len = Math.sqrt((xOff1 - xOff2) * (xOff1 - xOff2) + (yOff1 - yOff2) * (yOff1 - yOff2));
...@@ -1903,14 +1848,14 @@ CDrawingDocument.prototype = ...@@ -1903,14 +1848,14 @@ CDrawingDocument.prototype =
_ret.push(this.TargetPos.Y); _ret.push(this.TargetPos.Y);
_ret.push(this.TargetPos.Page); _ret.push(this.TargetPos.Page);
if (this.TextMatrix && !this.TextMatrix.IsIdentity()) if (this.selectionMatrix && !this.selectionMatrix.IsIdentity())
{ {
_ret.push(this.TextMatrix.sx); _ret.push(this.selectionMatrix.sx);
_ret.push(this.TextMatrix.shy); _ret.push(this.selectionMatrix.shy);
_ret.push(this.TextMatrix.shx); _ret.push(this.selectionMatrix.shx);
_ret.push(this.TextMatrix.sy); _ret.push(this.selectionMatrix.sy);
_ret.push(this.TextMatrix.tx); _ret.push(this.selectionMatrix.tx);
_ret.push(this.TextMatrix.ty); _ret.push(this.selectionMatrix.ty);
} }
return _ret; return _ret;
...@@ -1949,14 +1894,14 @@ CDrawingDocument.prototype = ...@@ -1949,14 +1894,14 @@ CDrawingDocument.prototype =
_ret.push(_select.End.Y + _select.End.H); _ret.push(_select.End.Y + _select.End.H);
_ret.push(_select.End.Page); _ret.push(_select.End.Page);
if (this.TextMatrix && !this.TextMatrix.IsIdentity()) if (this.selectionMatrix && !this.selectionMatrix.IsIdentity())
{ {
_ret.push(this.TextMatrix.sx); _ret.push(this.selectionMatrix.sx);
_ret.push(this.TextMatrix.shy); _ret.push(this.selectionMatrix.shy);
_ret.push(this.TextMatrix.shx); _ret.push(this.selectionMatrix.shx);
_ret.push(this.TextMatrix.sy); _ret.push(this.selectionMatrix.sy);
_ret.push(this.TextMatrix.tx); _ret.push(this.selectionMatrix.tx);
_ret.push(this.TextMatrix.ty); _ret.push(this.selectionMatrix.ty);
} }
return _ret; return _ret;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7