From 7c7d898b6e8f09f066817399214e51f454ff7982 Mon Sep 17 00:00:00 2001 From: Siqi LIU Date: Sun, 8 Sep 2013 13:33:42 +0200 Subject: disable pangesture recognizer when pointer image is displayed Change-Id: Iea5895b98a05faee0772569665c980eac716927b --- ios/iosremote/iosremote/Communication/CommandTransmitter.m | 11 ++++++++--- ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 8 ++++++-- ios/iosremote/iosremote/slideShow_vc_iphone.m | 3 +++ 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'ios') diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m b/ios/iosremote/iosremote/Communication/CommandTransmitter.m index 111c1ec68503..31d82c29f97b 100644 --- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m +++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m @@ -13,18 +13,19 @@ @interface CommandTransmitter() @property (nonatomic, weak) Client* client; - +@property NSInteger pointerCount; @end @implementation CommandTransmitter +@synthesize pointerCount = _pointerCount; @synthesize client = _client; - (CommandTransmitter*) initWithClient:(Client *)client { self = [self init]; self.client = client; - + return self; } @@ -51,11 +52,15 @@ - (void) setPointerVisibleAt: (CGPoint)aPoint { [self.client sendCommand:[NSString stringWithFormat:@"pointer_started\n%f\n%f\n\n", aPoint.x, aPoint.y]]; + self.pointerCount++; } - (void) setPointerDismissed { - [self.client sendCommand:@"pointer_dismissed\n\n"]; + if (self.pointerCount > 0) { + [self.client sendCommand:@"pointer_dismissed\n\n"]; + self.pointerCount--; + } } /** diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m index 01fbb9ccb113..ff65812653ca 100644 --- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m +++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m @@ -169,8 +169,12 @@ dispatch_queue_t backgroundQueue; UIPageControl * pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(self.revealViewController.rearViewRevealWidth - 20, view.frame.origin.y + 3, 40, 20)]; pageControl.numberOfPages = 2; pageControl.currentPage = self.currentPage; - pageControl.currentPageIndicatorTintColor = [UIColor whiteColor]; - pageControl.pageIndicatorTintColor = [UIColor lightGrayColor]; + + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0) + { + pageControl.currentPageIndicatorTintColor = [UIColor whiteColor]; + pageControl.pageIndicatorTintColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.7]; + } pageControl.tag = -100; view.tag = -99; label.tag = -98; diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index 1d8f2db7724a..de33023ab999 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -184,6 +184,9 @@ CGPoint p = self.view.center; p.y -= 50; self.touchPointerImage.center = p; + [self.view removeGestureRecognizer:self.revealViewController.panGestureRecognizer]; + } else { + [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; } [self.touchPointerImage fadeInfadeOutwithDuration:0.0 maxAlpha:1.0]; [self.blockingView fadeInfadeOutwithDuration:0.0 maxAlpha:0.7]; -- cgit