diff --git a/Excel/model/DrawingObjects/ShapeDrawer.js b/Excel/model/DrawingObjects/ShapeDrawer.js index 9c20ece8f542cd46b9db2988c3a32cdbae51afa2..226da7700f63a6406b954f105f679512384316c6 100644 --- a/Excel/model/DrawingObjects/ShapeDrawer.js +++ b/Excel/model/DrawingObjects/ShapeDrawer.js @@ -815,8 +815,15 @@ CShapeDrawer.prototype = if (this.Graphics.IsSlideBoundsCheckerType === true) return; + var bIsIntegerGridTRUE = false; if (this.bIsTexture) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + if (this.Graphics.RENDERER_PDF_FLAG) { if (null == this.UniFill.fill.tile || this.Graphics.m_oContext === undefined) @@ -827,6 +834,11 @@ CShapeDrawer.prototype = { this.Graphics.put_brushTexture(getFullImageSrc(this.UniFill.fill.RasterImageId), 1); } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } @@ -942,6 +954,11 @@ CShapeDrawer.prototype = _ctx.restore(); } } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } @@ -950,6 +967,12 @@ CShapeDrawer.prototype = var _fill = this.UniFill.fill; if (_fill.type == FILL_TYPE_PATT) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + var _is_ctx = false; if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255)) { @@ -1011,10 +1034,21 @@ CShapeDrawer.prototype = } _ctx.restore(); + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } else if (_fill.type == FILL_TYPE_GRAD) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + var _is_ctx = false; if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255)) { @@ -1065,6 +1099,11 @@ CShapeDrawer.prototype = { _ctx.fill(); } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } } diff --git a/Word/Drawing/ShapeDrawer.js b/Word/Drawing/ShapeDrawer.js index 9959401357fbc6321839082508ff22bf38bffffe..b0acabfc0604056ce485b7a0abcb180086b2c78b 100644 --- a/Word/Drawing/ShapeDrawer.js +++ b/Word/Drawing/ShapeDrawer.js @@ -775,8 +775,15 @@ CShapeDrawer.prototype = if (this.Graphics.IsSlideBoundsCheckerType === true) return; + var bIsIntegerGridTRUE = false; if (this.bIsTexture) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + if (this.Graphics.RENDERER_PDF_FLAG) { if (null == this.UniFill.fill.tile || this.Graphics.m_oContext === undefined) @@ -787,6 +794,11 @@ CShapeDrawer.prototype = { this.Graphics.put_brushTexture(_getFullImageSrc(this.UniFill.fill.RasterImageId), 1); } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } @@ -901,6 +913,11 @@ CShapeDrawer.prototype = _ctx.restore(); } } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } @@ -909,6 +926,12 @@ CShapeDrawer.prototype = var _fill = this.UniFill.fill; if (_fill.type == FILL_TYPE_PATT) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + var _is_ctx = false; if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255)) { @@ -969,10 +992,21 @@ CShapeDrawer.prototype = } _ctx.restore(); + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } else if (_fill.type == FILL_TYPE_GRAD) { + if (this.Graphics.m_bIntegerGrid === true) + { + this.Graphics.SetIntegerGrid(false); + bIsIntegerGridTRUE = true; + } + var _is_ctx = false; if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255)) { @@ -1023,6 +1057,11 @@ CShapeDrawer.prototype = { _ctx.fill(); } + + if (bIsIntegerGridTRUE) + { + this.Graphics.SetIntegerGrid(true); + } return; } }