Merge pull request #824 from crmagicxxx/_CCButonZoomFix

slembcke · slembcke · commit 3e3765f99ea3 · 2014-07-18T13:24:07.000-05:00
CCButton fix for "zoom when highlighted"
diff --git a/cocos2d-ui/CCButton.m b/cocos2d-ui/CCButton.m
@@ -321,6 +321,8 @@ - (void) stateChanged
             }
             
             [_label stopAllActions];
+            [_background stopAllActions];
+			
             if (_zoomWhenHighlighted)
             {
                 _label.scaleX = _originalScaleX;

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,8 @@ - (void) stateChanged`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`[_label stopAllActions];`
	`324`	`+ [_background stopAllActions];`
	`325`	`+`
`324`	`326`	`if (_zoomWhenHighlighted)`
`325`	`327`	`{`
`326`	`328`	`_label.scaleX = _originalScaleX;`