Skip to content

Commit 90fec9b

Browse files
authored
Merge pull request #3427 from zilongshanren/add-gray-effect-canvas-mode-support
fix canvas issue
2 parents 67c2e7d + 68deb55 commit 90fec9b

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

extensions/ccui/uiwidgets/UISlider.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,11 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
648648
this._slidBallDisabledRenderer.setVisible(false);
649649

650650
this._slidBallNormalRenderer.setScale(this._sliderBallNormalTextureScaleX, this._sliderBallNormalTextureScaleY);
651-
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
651+
if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
652+
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
653+
} else {
654+
// TODO: add canvas support
655+
}
652656
},
653657

654658
_onPressStateChangedToPressed: function () {
@@ -659,7 +663,11 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
659663
this._slidBallPressedRenderer.setVisible(true);
660664
this._slidBallDisabledRenderer.setVisible(false);
661665
}
662-
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
666+
if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
667+
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
668+
} else {
669+
// TODO: add canvas support
670+
}
663671
},
664672

665673
_onPressStateChangedToDisabled: function () {
@@ -668,7 +676,11 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
668676
this._slidBallDisabledRenderer.setVisible(true);
669677
} else {
670678
this._slidBallNormalRenderer.setVisible(true);
671-
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getGrayGLProgram();
679+
if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
680+
this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getGrayGLProgram();
681+
} else {
682+
// TODO: add canvas support
683+
}
672684
}
673685
this._slidBallNormalRenderer.setScale(this._sliderBallNormalTextureScaleX, this._sliderBallNormalTextureScaleY);
674686
this._slidBallPressedRenderer.setVisible(false);

0 commit comments

Comments
 (0)