From 25a3fc7bf169d28382991db3a1dd7663ff9faf53 Mon Sep 17 00:00:00 2001 From: shmyga Date: Tue, 26 May 2015 12:42:22 +0300 Subject: [PATCH] fixes --- haxework/gui/TextView.hx | 1 + haxework/gui/skin/ButtonBitmapSkin.hx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/haxework/gui/TextView.hx b/haxework/gui/TextView.hx index 4a6d30d..ac90966 100755 --- a/haxework/gui/TextView.hx +++ b/haxework/gui/TextView.hx @@ -49,6 +49,7 @@ class TextView extends SpriteView implements ITextView { textFormat = textField.defaultTextFormat; textFormat.font = "Arial"; textFormat.size = 16; + textFormat.leading = 0; textFormat.align = TextFormatAlign.CENTER; content.addChild(textField); } diff --git a/haxework/gui/skin/ButtonBitmapSkin.hx b/haxework/gui/skin/ButtonBitmapSkin.hx index 6d2cb79..2f6646d 100755 --- a/haxework/gui/skin/ButtonBitmapSkin.hx +++ b/haxework/gui/skin/ButtonBitmapSkin.hx @@ -20,6 +20,7 @@ class ButtonBitmapSkin implements ISkin implements ISize { public var upImage(null, set):BitmapData; public var overImage(null, set):BitmapData; public var downImage(null, set):BitmapData; + public var disableImage(null, default):BitmapData; private var images:Map; private var disable:BitmapData; @@ -62,7 +63,7 @@ class ButtonBitmapSkin implements ISkin implements ISize { public function draw(view:ButtonView):Void { if (images == null) return; - var image:BitmapData = view.disabled ? disable : images.get(view.state); + var image:BitmapData = view.disabled ? disableImage == null ? disable : disableImage : images.get(view.state); DrawUtil.draw(view.content.graphics, image, new Rectangle(0, 0, view.width, view.height), fillType, color); }