File tree 3 files changed +6
-3
lines changed
extensions/CocoStudio/GUI/UIWidgets/ScrollWidget
3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -434,7 +434,8 @@ ccs.UIListView = ccs.UILayout.extend({
434
434
* @param {cc.Point } touchPoint
435
435
*/
436
436
checkChildInfo : function ( handleState , sender , touchPoint ) {
437
- this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
437
+ if ( this . _enabled && this . _touchEnabled )
438
+ this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
438
439
} ,
439
440
440
441
moveChildren : function ( offset ) {
Original file line number Diff line number Diff line change @@ -494,7 +494,8 @@ ccs.UIPageView = ccs.UILayout.extend({
494
494
} ,
495
495
496
496
checkChildInfo : function ( handleState , sender , touchPoint ) {
497
- this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
497
+ if ( this . _enabled && this . _touchEnabled )
498
+ this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
498
499
} ,
499
500
500
501
interceptTouchEvent : function ( handleState , sender , touchPoint ) {
Original file line number Diff line number Diff line change @@ -1302,7 +1302,8 @@ ccs.UIScrollView = ccs.UILayout.extend({
1302
1302
* @param {cc.Point } touchPoint
1303
1303
*/
1304
1304
checkChildInfo : function ( handleState , sender , touchPoint ) {
1305
- this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
1305
+ if ( this . _enabled && this . _touchEnabled )
1306
+ this . interceptTouchEvent ( handleState , sender , touchPoint ) ;
1306
1307
} ,
1307
1308
1308
1309
scrollToTopEvent : function ( ) {
You can’t perform that action at this time.
0 commit comments