[TIMOB-15939] iOS7: Workaround actionsheet rendering issue

tidev · Dec 10, 2013 · 5f30b38 · dawsontoth · Dec 12, 2015 · 5f30b38
1 parent a913739
commit 5f30b38
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/iphone/Classes/TiUIOptionDialogProxy.h b/iphone/Classes/TiUIOptionDialogProxy.h
@@ -11,14 +11,15 @@
 
 @interface TiUIOptionDialogProxy : TiProxy<UIActionSheetDelegate> {
 
-	UIActionSheet *actionSheet;
+    UIActionSheet *actionSheet;
 //We need to hold onto this information for whenever the status bar rotates.
-	TiViewProxy *dialogView;
-	CGRect dialogRect;
-	BOOL animated;
+    TiViewProxy *dialogView;
+    CGRect dialogRect;
+    BOOL animated;
     NSUInteger accumulatedOrientationChanges;
-	BOOL showDialog;
+    BOOL showDialog;
     BOOL persistentFlag;
+    BOOL forceOpaqueBackground;
 }
 
 @property(nonatomic,retain,readwrite)	TiViewProxy *dialogView;

diff --git a/iphone/Classes/TiUIOptionDialogProxy.m b/iphone/Classes/TiUIOptionDialogProxy.m
@@ -50,7 +50,7 @@ -(void)show:(id)args
 	}
 
     persistentFlag = [TiUtils boolValue:[self valueForKey:@"persistent"] def:YES];
-
+    forceOpaqueBackground = [TiUtils boolValue:[self valueForKey:@"opaquebackground"] def:NO];
 	if (actionSheet != nil) {
 		[actionSheet setDelegate:nil];
 		[actionSheet release];
@@ -141,6 +141,19 @@ -(void)suspended:(NSNotification*)note
 
 #pragma mark AlertView Delegate
 
+- (void)willPresentActionSheet:(UIActionSheet *)actionSheet_
+{
+    //TIMOB-15939. Workaround rendering issue on iPAD on iOS7
+    if (actionSheet_ == actionSheet && forceOpaqueBackground &&[TiUtils isIOS7OrGreater] && [TiUtils isIPad]) {
+        NSArray* subviews = [actionSheet subviews];
+
+        for (UIView* subview in subviews) {
+            [subview setBackgroundColor:[UIColor whiteColor]];
+        }
+        [actionSheet setBackgroundColor:[UIColor whiteColor]];
+    }
+}
+
 - (void)actionSheet:(UIActionSheet *)actionSheet_ didDismissWithButtonIndex:(NSInteger)buttonIndex;
 {
 	if (buttonIndex == -2)