hedgewars: comparison project_files/HedgewarsMobile/Classes/OverlayViewController.m

equal deleted inserted replaced

-:33ee433749ba
+:b5cdbcc89b61
 #pragma mark -
 #pragma mark Custom touch event handling
 -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
 NSSet *allTouches = [event allTouches];
-UITouch *touch, *first, *second;
+UITouch *first, *second;
 if (isPopoverVisible) {
 [self dismissPopover];
 }
 /*
 [dimTimer setFireDate:HIDING_TIME_DEFAULT];
 }
 */
 switch ([allTouches count]) {
 case 1:
-touch = [[allTouches allObjects] objectAtIndex:0];
-CGPoint currentPosition = [touch locationInView:self.view];
-//DLog(@"X:%d Y:%d", HWX(currentPosition.x), HWY(currentPosition.y));
-// this is a single touch/tap
-isSingleClick = YES;
-// save were the click event will take place
-pointWhereToClick = currentPosition;
 removeConfirmationInput();
-if (2 == [touch tapCount])
+if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount])
 HW_zoomReset();
 break;
 case 2:
 // pinching
 first = [[allTouches allObjects] objectAtIndex:0];
 //if (currentPosition.y < screen.size.width - 130 || (currentPosition.x > 130 && currentPosition.x < screen.size.height - 130)) {
 -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
 CGRect screen = [[UIScreen mainScreen] bounds];
 NSSet *allTouches = [event allTouches];
-UITouch *touch;
+CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
 switch ([allTouches count]) {
 case 1:
+// if we're in the menu we just click in the point
 if (HW_isAmmoOpen()) {
-// if we're in the menu we just click in the point
+HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
-HW_setCursor(HWX(pointWhereToClick.x), HWY(pointWhereToClick.y));
+// this click doesn't need any wrapping because the ammoMenu already limits the cursor
 HW_click();
 } else
-if (isSingleClick) {
+// if weapon requires a further click, ask for tapping again
-// if they tapped in the screen we trick the system so that camera doesn't move
+if (HW_isWeaponRequiringClick()) {
-HW_saveCursor(FALSE);
+// here don't have to wrap thanks to isCursorVisible magic
-HW_setCursor(HWX(pointWhereToClick.x), HWY(pointWhereToClick.y));
+HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
-HW_click();
-HW_saveCursor(TRUE);
-// and remove the label (if any)
+// draw the button at the last touched point (which is the current position)
-removeConfirmationInput();
+UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-} else {
+tapAgain.frame = CGRectMake(currentPosition.x - 90, currentPosition.y + 15, 180, 30);
-// if weapon requires a further click, ask for tapping again
+tapAgain.tag = CONFIRMATION_TAG;
-if (HW_isWeaponRequiringClick()) {
+tapAgain.alpha = 0;
-touch = [[allTouches allObjects] objectAtIndex:0];
+[tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside];
-CGPoint currentPosition = [touch locationInView:self.view];
+[tapAgain setTitle:NSLocalizedString(@"Tap again to confirm",@"from the overlay") forState:UIControlStateNormal];
-UILabel *tapAgain = [[UILabel alloc] initWithFrame:CGRectMake(currentPosition.x-100, currentPosition.y + 10, 200, 25)];
+[self.view addSubview:tapAgain];
-tapAgain.text = NSLocalizedString(@"Tap again to confirm",@"from the overlay");
-tapAgain.backgroundColor = [UIColor clearColor];
+// animation ftw!
-tapAgain.tag = CONFIRMATION_TAG;
+[UIView beginAnimations:@"inserting button" context:NULL];
-tapAgain.textColor = [UIColor blueColor];
+[UIView setAnimationDuration:ANIMATION_DURATION];
-tapAgain.textAlignment = UITextAlignmentCenter;
+[self.view viewWithTag:CONFIRMATION_TAG].alpha = 1;
-tapAgain.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
+[UIView commitAnimations];
-[self.view addSubview:tapAgain];
-[tapAgain release];
-}
 }
 break;
 case 2:
 HW_allKeysUp();
 break;
-}
+default:
+DLog(@"too many touches");
-pointWhereToClick = CGPointZero;
+break;
+}
 initialDistanceForPinching = 0;
-isSingleClick = NO;
+}
+-(void) sendHWClick {
+HW_click();
+removeConfirmationInput();
 }
 -(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
 [self touchesEnded:touches withEvent:event];
 }
 switch ([allTouches count]) {
 case 1:
 touch = [[allTouches allObjects] objectAtIndex:0];
 CGPoint currentPosition = [touch locationInView:self.view];
-isSingleClick = NO;
 if (HW_isAmmoOpen()) {
-// saves the point on which to select the ammo
+// moves the cursor around
-pointWhereToClick = currentPosition;
-// moves the cursor over
 HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
 } else {
 DLog(@"x: %f y: %f -> X:%d Y:%d", currentPosition.x, currentPosition.y, HWX(currentPosition.x), HWY(currentPosition.y));
 HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
 }
 default:
 break;
 }
 }
 // called from AddProgress and FinishProgress (respectively)
 void startSpinning() {
 isGameRunning = NO;
 CGRect screen = [[UIScreen mainScreen] bounds];
 UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
 UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)[[[[UIApplication sharedApplication] keyWindow] viewWithTag:12345] viewWithTag:987654];
 [indicator stopAnimating];
 isGameRunning = YES;
 }
+void clearView() {
+UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow];
+UIButton *theButton = (UIButton *)[theWindow viewWithTag:CONFIRMATION_TAG];
+[UIView beginAnimations:@"remove button" context:NULL];
+[UIView setAnimationDuration:ANIMATION_DURATION];
+theButton.alpha = 0;
+[UIView commitAnimations];
+[theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:0.3];
+}
 @end

changeset 3639	b5cdbcc89b61
parent 3638	33ee433749ba
child 3646	a3271158d93b