Merge pull request #781 from richardgroves/patch-1

slembcke · slembcke · commit 8ed0a5978eb3 · 2014-05-23T17:24:35.000-05:00
CCSlider can be dragged on iOS when !enabled
diff --git a/cocos2d-ui/CCSlider.m b/cocos2d-ui/CCSlider.m
@@ -76,6 +76,8 @@ - (void) updateSliderPositionFromValue
 
 - (void) touchEntered:(UITouch*)touch withEvent:(UIEvent*)event
 {
+    if (!self.enabled) return;
+    
     CGPoint worldLocation = [touch locationInWorld];
     
     [self inputEnteredWithWorlPos:worldLocation];

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ - (void) updateSliderPositionFromValue`
`76`	`76`
`77`	`77`	`- (void) touchEntered:(UITouch)touch withEvent:(UIEvent)event`
`78`	`78`	`{`
	`79`	`+ if (!self.enabled) return;`
	`80`	`+`
`79`	`81`	`CGPoint worldLocation = [touch locationInWorld];`
`80`	`82`
`81`	`83`	`[self inputEnteredWithWorlPos:worldLocation];`