File tree Expand file tree Collapse file tree 2 files changed +13
-0
lines changed Expand file tree Collapse file tree 2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -1692,6 +1692,14 @@ ccui.Widget = ccui.ProtectedNode.extend(/** @lends ccui.Widget# */{
1692
1692
cc . arrayRemoveObject ( this . _nodes , node ) ;
1693
1693
} ,
1694
1694
1695
+ _getNormalGLProgram : function ( ) {
1696
+ return cc . shaderCache . programForKey ( cc . SHADER_SPRITE_POSITION_TEXTURECOLOR ) ;
1697
+ } ,
1698
+
1699
+ _getGrayGLProgram : function ( ) {
1700
+ return cc . shaderCache . programForKey ( cc . SHADER_SPRITE_POSITION_TEXTURECOLOR_GRAY ) ;
1701
+ } ,
1702
+
1695
1703
/**
1696
1704
* Removes node by tag
1697
1705
* @deprecated since v3.0, please use removeChildByTag instead.
Original file line number Diff line number Diff line change @@ -648,6 +648,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
648
648
this . _slidBallDisabledRenderer . setVisible ( false ) ;
649
649
650
650
this . _slidBallNormalRenderer . setScale ( this . _sliderBallNormalTextureScaleX , this . _sliderBallNormalTextureScaleY ) ;
651
+ this . _slidBallNormalRenderer . _renderCmd . _shaderProgram = this . _getNormalGLProgram ( ) ;
651
652
} ,
652
653
653
654
_onPressStateChangedToPressed : function ( ) {
@@ -658,12 +659,16 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
658
659
this . _slidBallPressedRenderer . setVisible ( true ) ;
659
660
this . _slidBallDisabledRenderer . setVisible ( false ) ;
660
661
}
662
+ this . _slidBallNormalRenderer . _renderCmd . _shaderProgram = this . _getNormalGLProgram ( ) ;
661
663
} ,
662
664
663
665
_onPressStateChangedToDisabled : function ( ) {
664
666
if ( this . _slidBallDisabledTextureFile ) {
665
667
this . _slidBallNormalRenderer . setVisible ( false ) ;
666
668
this . _slidBallDisabledRenderer . setVisible ( true ) ;
669
+ } else {
670
+ this . _slidBallNormalRenderer . setVisible ( true ) ;
671
+ this . _slidBallNormalRenderer . _renderCmd . _shaderProgram = this . _getGrayGLProgram ( ) ;
667
672
}
668
673
this . _slidBallNormalRenderer . setScale ( this . _sliderBallNormalTextureScaleX , this . _sliderBallNormalTextureScaleY ) ;
669
674
this . _slidBallPressedRenderer . setVisible ( false ) ;
You can’t perform that action at this time.
0 commit comments