|
@@ -56,7 +56,11 @@ export class SGraphyCircleItem extends SGraphyItem {
|
|
|
* @param painter painter对象
|
|
|
* @param rect 绘制区域
|
|
|
*/
|
|
|
+<<<<<<< HEAD
|
|
|
onDraw(painter: SPainter, rect?: SRect): void {
|
|
|
+=======
|
|
|
+ onDraw(painter: SPainter, rect: SRect): void {
|
|
|
+>>>>>>> c764c27108df9d02d952526c79bcabdf4c678a60
|
|
|
// painter.pen = new SPen(new SColor("#FF0000"), 22);
|
|
|
painter.pen.color = this.color;
|
|
|
painter.brush.color = this.fillColor;
|