Commit 198046c6 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

target update

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58268 954022d7-b5bf-4e40-9824-e11837661b57
parent cb148b38
...@@ -558,6 +558,11 @@ function CDrawingDocument() ...@@ -558,6 +558,11 @@ function CDrawingDocument()
this.IsUpdateOverlayOnlyEndReturn = false; this.IsUpdateOverlayOnlyEndReturn = false;
this.IsUpdateOverlayOnEndCheck = false; this.IsUpdateOverlayOnEndCheck = false;
this.UpdateTargetFromPaint = false;
this.UpdateTargetCheck = true;
this.TargetShowNeedFlag = false;
this.TargetShowNeedFlag = false;
this.m_bIsSelection = false; this.m_bIsSelection = false;
this.m_bIsMouseLock = false; this.m_bIsMouseLock = false;
...@@ -723,6 +728,8 @@ CDrawingDocument.prototype = ...@@ -723,6 +728,8 @@ CDrawingDocument.prototype =
}, },
TargetEnd : function() TargetEnd : function()
{ {
this.TargetShowFlag = false;
this.TargetShowNeedFlag = false;
this.Native["DD_TargetEnd"](); this.Native["DD_TargetEnd"]();
}, },
SetTargetColor : function(r, g, b) SetTargetColor : function(r, g, b)
...@@ -739,6 +746,7 @@ CDrawingDocument.prototype = ...@@ -739,6 +746,7 @@ CDrawingDocument.prototype =
UpdateTarget : function(x, y, pageIndex) UpdateTarget : function(x, y, pageIndex)
{ {
this.LogicDocument.Set_TargetPos( x, y, pageIndex ); this.LogicDocument.Set_TargetPos( x, y, pageIndex );
this.UpdateTargetCheck = true;
this.Native["DD_UpdateTarget"](x, y, pageIndex); this.Native["DD_UpdateTarget"](x, y, pageIndex);
}, },
SetTargetSize : function(size) SetTargetSize : function(size)
...@@ -748,7 +756,28 @@ CDrawingDocument.prototype = ...@@ -748,7 +756,28 @@ CDrawingDocument.prototype =
}, },
TargetShow : function() TargetShow : function()
{ {
this.TargetShowNeedFlag = true;
//this.Native["DD_TargetShow"]();
},
CheckTargetShow : function()
{
if (this.TargetShowFlag && this.TargetShowNeedFlag)
{
this.Native["DD_TargetShow"]();
this.TargetShowNeedFlag = false;
return;
}
if (!this.TargetShowNeedFlag)
return;
this.TargetShowNeedFlag = false;
this.TargetStart();
this.Native["DD_TargetShow"](); this.Native["DD_TargetShow"]();
this.TargetShowFlag = true;
}, },
// track images // track images
......
...@@ -77,7 +77,10 @@ asc_docs_api.prototype["Call_TurnOnRecalculate"] = function() ...@@ -77,7 +77,10 @@ asc_docs_api.prototype["Call_TurnOnRecalculate"] = function()
asc_docs_api.prototype["Call_CheckTargetUpdate"] = function() asc_docs_api.prototype["Call_CheckTargetUpdate"] = function()
{ {
this.WordControl.m_oDrawingDocument.UpdateTargetFromPaint = true;
this.WordControl.m_oLogicDocument.CheckTargetUpdate(); this.WordControl.m_oLogicDocument.CheckTargetUpdate();
this.WordControl.m_oDrawingDocument.CheckTargetShow();
this.WordControl.m_oDrawingDocument.UpdateTargetFromPaint = false;
}; };
asc_docs_api.prototype["Call_HR_Tabs"] = function(arrT, arrP) asc_docs_api.prototype["Call_HR_Tabs"] = function(arrT, arrP)
......
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