Commit d643537c authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Сделано, чтобы изменять матрицу отрисовки селекта можно было много раз....

Сделано, чтобы изменять матрицу отрисовки селекта можно было много раз. Добавлен флаг для управления обводкой селекта.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68236 954022d7-b5bf-4e40-9824-e11837661b57
parent c9b735fa
......@@ -2448,6 +2448,7 @@ function CDrawingDocument()
this.Overlay = null;
this.IsTextMatrixUse = false;
this.IsTextSelectionOutline = false;
this.HorVerAnchors = [];
......@@ -4700,6 +4701,11 @@ function CDrawingDocument()
this.m_oWordControl.m_oApi.sync_SearchEndCallback();
}
this.SetTextSelectionOutline = function(isSelectionOutline)
{
this.IsTextSelectionOutline = isSelectionOutline;
}
this.private_StartDrawSelection = function(overlay)
{
this.Overlay = overlay;
......@@ -4708,9 +4714,6 @@ function CDrawingDocument()
this.Overlay.m_oContext.fillStyle = "rgba(51,102,204,255)";
this.Overlay.m_oContext.beginPath();
if (this.IsTextMatrixUse)
this.Overlay.m_oContext.strokeStyle = "#9ADBFE";
if (this.m_oWordControl.MobileTouchManager)
{
this.m_oWordControl.MobileTouchManager.RectSelect1 = null;
......@@ -4724,8 +4727,9 @@ function CDrawingDocument()
ctx.globalAlpha = 0.2;
ctx.fill();
if (this.IsTextMatrixUse)
if (this.IsTextMatrixUse && this.IsTextSelectionOutline)
{
ctx.strokeStyle = "#9ADBFE";
ctx.lineWidth = 1;
ctx.globalAlpha = 1.0;
ctx.stroke();
......@@ -4740,6 +4744,8 @@ function CDrawingDocument()
this.AddPageSelection = function(pageIndex, x, y, w, h)
{
this.IsTextMatrixUse = ((null != this.TextMatrix) && !global_MatrixTransformer.IsIdentity(this.TextMatrix));
if (pageIndex < this.m_lDrawingFirst || pageIndex > this.m_lDrawingEnd)
{
if (this.m_oWordControl.MobileTouchManager)
......@@ -4857,6 +4863,8 @@ function CDrawingDocument()
this.AddPageSelection2 = function(pageIndex, x, y, width, height)
{
this.IsTextMatrixUse = ((null != this.TextMatrix) && !global_MatrixTransformer.IsIdentity(this.TextMatrix));
//if (pageIndex < 0 || pageIndex >= Math.max(this.m_lPagesCount, this.m_lCountCalculatePages) || Math.abs(width) < 0.001 || Math.abs(height) < 0.001)
// return;
if (Math.abs(width) < 0.001 || Math.abs(height) < 0.001)
......
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