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

overlay bug

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56508 954022d7-b5bf-4e40-9824-e11837661b57
parent 67b7509d
......@@ -2162,6 +2162,19 @@ function CreteSolidFillRGB(r, g, b)
return ret;
}
function CreateSolidFillRGBA(r, g, b, a)
{
var ret = new CUniFill();
ret.setFill(new CSolidFill());
ret.fill.setColor(new CUniColor());
var _uni_color = ret.fill.color;
_uni_color.RGBA.R = r;
_uni_color.RGBA.G = g;
_uni_color.RGBA.B = b;
_uni_color.RGBA.A = a;
return ret;
}
// -----------------------------
// FILL ------------------------
......
......@@ -47,8 +47,30 @@ function OverlayObject(geometry, extX, extY, brush, pen, transform)
}
else
{
if (window["NATIVE_EDITOR_ENJINE"] === true)
{
var _shape = new CShape();
_shape.extX = this.ext.cx;
_shape.extY = this.ext.cy;
_shape.brush = CreateSolidFillRGBA(255, 255, 255, 128);
_shape.pen = new CLn();
_shape.pen.Fill = CreateSolidFillRGBA(0, 0, 0, 160);
_shape.pen.w = 18000;
overlay.SaveGrState();
overlay.SetIntegerGrid(false);
overlay.transform3(this.TransformMatrix, false);
this.shapeDrawer.fromShape2(_shape, overlay, null);
this.shapeDrawer.draw(null);
overlay.RestoreGrState();
}
else
{
overlay.SaveGrState();
overlay.SetIntegerGrid(false);
overlay.transform3(this.TransformMatrix);
overlay._s();
overlay._m(0, 0);
overlay._l(this.ext.cx, 0);
overlay._l(this.ext.cx, this.ext.cy);
......@@ -59,6 +81,9 @@ function OverlayObject(geometry, extX, extY, brush, pen, transform)
overlay.ds();
overlay.b_color1(255,255,255,128);
overlay.df();
overlay._e();
overlay.RestoreGrState();
}
}
};
......
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