Merging 1.7.5 Source: ui changes

This commit is contained in:
Evan Debenham
2015-01-30 14:05:10 -05:00
parent 4499685b09
commit 894f7d9d06
9 changed files with 148 additions and 37 deletions
@@ -66,18 +66,18 @@ public class RedButton extends Button {
icon.x = x + text.x - icon.width() - 2;
icon.y = y + (height - icon.height()) / 2;
}
};
}
@Override
protected void onTouchDown() {
bg.brightness( 1.2f );
Sample.INSTANCE.play( Assets.SND_CLICK );
};
}
@Override
protected void onTouchUp() {
bg.resetColor();
};
}
public void enable( boolean value ) {
active = value;
@@ -89,7 +89,11 @@ public class RedButton extends Button {
text.measure();
layout();
}
public void textColor( int value ) {
text.hardlight( value );
}
public void icon( Image icon ) {
if (this.icon != null) {
remove( this.icon );