Skip to content

Commit f7f5020

Browse files
committed
fix button gray state
1 parent 62f7aaa commit f7f5020

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

extensions/ccui/uiwidgets/UIButton.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
460460
_onPressStateChangedToNormal: function () {
461461
this._buttonScale9Renderer.setSpriteFrame(this._buttonNormalSpriteFrame);
462462

463-
if (this._scale9Enabled) {
464-
this._buttonScale9Renderer.setState( ccui.Scale9Sprite.state.NORMAL);
465-
}
463+
this._buttonScale9Renderer.setState( ccui.Scale9Sprite.state.NORMAL);
466464

467465
if (this._pressedTextureLoaded) {
468466
if (this.pressedActionEnabled){
@@ -500,9 +498,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
500498
},
501499

502500
_onPressStateChangedToPressed: function () {
503-
if (this._scale9Enabled) {
504-
this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.NORMAL);
505-
}
501+
this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.NORMAL);
506502

507503
if (this._pressedTextureLoaded) {
508504
this._buttonScale9Renderer.setSpriteFrame(this._buttonClickedSpriteFrame);
@@ -539,7 +535,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
539535
_onPressStateChangedToDisabled: function () {
540536
//if disable resource is null
541537
if (!this._disabledTextureLoaded){
542-
if (this._normalTextureLoaded && this._scale9Enabled) {
538+
if (this._normalTextureLoaded) {
543539
this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.GRAY);
544540
}
545541
}else{

0 commit comments

Comments
 (0)