From a6ebe3ce5fdbea5528fd7ffdd1416b19ec79906e Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Fri, 24 Jun 2016 14:36:21 +0800 Subject: [PATCH] fix button state error when scroll in scrollview --- cocos2d/core/components/CCButton.js | 4 ++++ cocos2d/core/components/CCScrollView.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index f18a763a0a..9de5498677 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -416,6 +416,10 @@ var Button = cc.Class({ event.stopPropagation(); }, + _cancelButtonClick: function(){ + this._pressed = false; + }, + _onTouchCancel: function () { if (!this.interactable || !this.enabledInHierarchy) return; diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 424d54a87d..39002a224c 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -796,6 +796,10 @@ var ScrollView = cc.Class({ //FIXME: touch move delta should be calculated by DPI. if (cc.pLength(deltaMove) > 7) { this._touchMoved = true; + var buttonComponent = event.target.getComponent(cc.Button); + if (buttonComponent) { + buttonComponent._cancelButtonClick(); + } } // TODO: detect move distance, if distance greater than a seuil, then stop propagation. event.stopPropagation();