Commit a153e2bb authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Принятый вторым юзером объект показывался как залоченный(неверная отрисовка на оверлее)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51289 954022d7-b5bf-4e40-9824-e11837661b57
parent 8048339f
...@@ -943,6 +943,7 @@ CChartAsGroup.prototype = ...@@ -943,6 +943,7 @@ CChartAsGroup.prototype =
{ {
graphics.SetIntegerGrid(false); graphics.SetIntegerGrid(false);
graphics.transform3(transform, false); graphics.transform3(transform, false);
if ( !graphics.m_oContext.isOverlay )
graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY ); graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY );
graphics.reset(); graphics.reset();
graphics.SetIntegerGrid(true); graphics.SetIntegerGrid(true);
......
...@@ -810,6 +810,7 @@ CImageShape.prototype = ...@@ -810,6 +810,7 @@ CImageShape.prototype =
{ {
graphics.SetIntegerGrid(false); graphics.SetIntegerGrid(false);
graphics.transform3(transform, false); graphics.transform3(transform, false);
if ( !graphics.m_oContext.isOverlay )
graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY ); graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY );
graphics.reset(); graphics.reset();
graphics.SetIntegerGrid(true); graphics.SetIntegerGrid(true);
......
...@@ -2090,6 +2090,7 @@ CShape.prototype = ...@@ -2090,6 +2090,7 @@ CShape.prototype =
{ {
graphics.SetIntegerGrid(false); graphics.SetIntegerGrid(false);
graphics.transform3(transform, false); graphics.transform3(transform, false);
if ( !graphics.m_oContext.isOverlay )
graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY ); graphics.DrawLockObjectRect(this.lockType, 0, 0, extX, extY );
graphics.reset(); graphics.reset();
graphics.SetIntegerGrid(true); graphics.SetIntegerGrid(true);
......
...@@ -139,6 +139,8 @@ ...@@ -139,6 +139,8 @@
this.buffers.main = asc_DC({canvas: this.canvas[0], units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics}); this.buffers.main = asc_DC({canvas: this.canvas[0], units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics});
this.buffers.overlay = asc_DC({canvas: this.canvasOverlay[0], units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics}); this.buffers.overlay = asc_DC({canvas: this.canvasOverlay[0], units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics});
this.buffers.overlay.ctx.isOverlay = true; // Для разруливания _activateOverlayCtx / _deactivateOverlayCtx
this.drawingCtx = this.buffers.main; this.drawingCtx = this.buffers.main;
this.overlayCtx = this.buffers.overlay; this.overlayCtx = this.buffers.overlay;
......
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