From a253aeaed429837b4d3b8dd6665caa77a355b7b3 Mon Sep 17 00:00:00 2001 From: shmyga Date: Wed, 11 Sep 2019 21:04:42 +0300 Subject: [PATCH] [view] SpriteSkin: add round param --- src/main/haxework/view/skin/ButtonColorSkin.hx | 4 ++-- src/main/haxework/view/skin/SpriteSkin.hx | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/haxework/view/skin/ButtonColorSkin.hx b/src/main/haxework/view/skin/ButtonColorSkin.hx index 872741d..7381ed4 100644 --- a/src/main/haxework/view/skin/ButtonColorSkin.hx +++ b/src/main/haxework/view/skin/ButtonColorSkin.hx @@ -14,10 +14,10 @@ using haxework.color.ColorUtil; @:style(0xffffff) public var color(default, default):Null; @:style(null) public var borderColor(default, default):Null; - public var round(default, default):Float; + @:style(15) public var round(default, default):Null; private var colors:Map; - public function new(?color:Color, ?borderColor:Color, round:Float = 15) { + public function new(?color:Color, ?borderColor:Color, ?round:Float) { this.color = color; this.borderColor = borderColor; this.round = round; diff --git a/src/main/haxework/view/skin/SpriteSkin.hx b/src/main/haxework/view/skin/SpriteSkin.hx index dea99c1..8931cf0 100644 --- a/src/main/haxework/view/skin/SpriteSkin.hx +++ b/src/main/haxework/view/skin/SpriteSkin.hx @@ -6,10 +6,12 @@ import flash.display.Graphics; @:style public var border(default, default):Border; @:style public var background(default, default):Background; + @:style(null) public var round(default, default):Null; - public function new(?background:Background, ?border:Border) { + public function new(?background:Background, ?border:Border, ?round:Float) { this.background = background != null ? background : new Background(); this.border = border != null ? border : new Border(); + this.round = round; } public function draw(view:SpriteView):Void { @@ -24,7 +26,11 @@ import flash.display.Graphics; graphics.beginFill(0, 0); } var o = border.color != null ? border.thickness / 2 : 0; - graphics.drawRect(o, o, view.width - o * 2, view.height - o * 2); + if (round != null) { + graphics.drawRoundRect(o, o, view.width - o * 2, view.height - o * 2, round, round); + } else { + graphics.drawRect(o, o, view.width - o * 2, view.height - o * 2); + } graphics.lineStyle(); graphics.endFill(); }