Merge pull request #4740 from vishalduggal/timob-15283

[TIMOB-15283] iOS: SplitWindow does not respond to focus events
tidev · Sep 26, 2013 · 62b0ab3 · 62b0ab3
2 parents 48d3cf2 + 37d46c2
commit 62b0ab3
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 20 deletions.
diff --git a/iphone/Classes/MGSplitView/MGSplitViewController.m b/iphone/Classes/MGSplitView/MGSplitViewController.m
@@ -739,16 +739,16 @@ - (IBAction)toggleMasterView:(id)sender
 - (IBAction)showMasterPopover:(id)sender
 {
 	if (_hiddenPopoverController && !(_hiddenPopoverController.popoverVisible)) {
+		// Show popover.
+		[(MGSplitView*)[self view] setSingleLayout];
+		[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
 		// Inform delegate.
 		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
-			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self 
-																	 popoverController:_hiddenPopoverController 
+			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
+																	 popoverController:_hiddenPopoverController
 															 willPresentViewController:self.masterViewController];
 		}
 
-		// Show popover.
-        [(MGSplitView*)[self view] setSingleLayout];
-		[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
 	}
 }
 

diff --git a/iphone/Classes/TiUIiPadSplitWindow.h b/iphone/Classes/TiUIiPadSplitWindow.h
@@ -15,6 +15,7 @@
 
 #import "TiUIView.h"
 #import "MGSplitViewController.h"
+#import "TiUIiPadSplitWindowProxy.h"
 
 @class TiUIiPadPopoverProxy;
 

diff --git a/iphone/Classes/TiUIiPadSplitWindow.m b/iphone/Classes/TiUIiPadSplitWindow.m
@@ -29,6 +29,7 @@
 {
     if ([proxy isKindOfClass:[TiWindowProxy class]]) {
         [(TiWindowProxy*)proxy setIsManaged:YES];
+        return [(TiWindowProxy*)proxy hostingController];
     }
 
 	[[proxy view] setAutoresizingMask:UIViewAutoresizingNone];
@@ -67,13 +68,19 @@ -(UIViewController*)controller
 
 		[controller willAnimateRotationToInterfaceOrientation:[[UIApplication sharedApplication] statusBarOrientation] duration:0.0];
 
-
-		[masterProxy windowWillOpen];
-		[masterProxy windowDidOpen];
+		if ([masterProxy isKindOfClass:[TiWindowProxy class]]) {
+			[(TiWindowProxy*)masterProxy open:nil];
+		} else {
+			[masterProxy windowWillOpen];
+			[masterProxy windowDidOpen];
+		}
 
-		[detailProxy windowWillOpen];
-		[detailProxy windowDidOpen];
-
+		if ([detailProxy isKindOfClass:[TiWindowProxy class]]) {
+			[(TiWindowProxy*)detailProxy open:nil];
+		} else {
+			[detailProxy windowWillOpen];
+			[detailProxy windowDidOpen];
+		}
 		[controller viewDidAppear:NO];
 	}
 	return controller;
@@ -130,7 +137,7 @@ -(void)setMasterPopupVisible_:(id)value
 
 	if (masterInSplit)
 	{
-		[[self proxy] replaceValue:NUMBOOL(NO) forKey:@"masterPopupVisibile" notification:NO];
+		[(TiUIiPadSplitWindowProxy*) [self proxy] popupVisibilityChanged:NO];
 		return;
 	}
 
@@ -157,7 +164,7 @@ -(void)setShowMasterInPortrait_:(id)value
 
 - (void)splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController:(UIPopoverController*)pc
 {
-	[[self proxy] replaceValue:NUMBOOL(NO) forKey:@"masterPopupVisibile" notification:NO];
+	[(TiUIiPadSplitWindowProxy*) [self proxy] popupVisibilityChanged:NO];
 	if ([self.proxy _hasListeners:@"visible"])
 	{
 		NSMutableDictionary *event = [NSMutableDictionary dictionaryWithObject:@"detail" forKey:@"view"];
@@ -172,7 +179,7 @@ - (void)splitViewController:(UISplitViewController*)svc willHideViewController:(
 
 - (void)splitViewController:(UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)button
 {
-	[[self proxy] replaceValue:NUMBOOL(NO) forKey:@"masterPopupVisibile" notification:NO];
+	[(TiUIiPadSplitWindowProxy*) [self proxy] popupVisibilityChanged:NO];
 	if ([self.proxy _hasListeners:@"visible"])
 	{
 		NSDictionary *event = [NSDictionary dictionaryWithObject:@"master" forKey:@"view"];
@@ -182,7 +189,7 @@ - (void)splitViewController:(UISplitViewController*)svc willShowViewController:(
 
 - (void)splitViewController:(UISplitViewController*)svc popoverController:(UIPopoverController*)pc willPresentViewController:(UIViewController *)aViewController
 {
-	[[self proxy] replaceValue:NUMBOOL(YES) forKey:@"masterPopupVisibile" notification:NO];
+	[(TiUIiPadSplitWindowProxy*) [self proxy] popupVisibilityChanged:YES];
 	if ([self.proxy _hasListeners:@"visible"])
 	{
 		NSMutableDictionary *event = [NSMutableDictionary dictionaryWithObject:@"popover" forKey:@"view"];

diff --git a/iphone/Classes/TiUIiPadSplitWindowProxy.h b/iphone/Classes/TiUIiPadSplitWindowProxy.h
@@ -15,7 +15,7 @@
 @private
 	id<NSObject,TiOrientationController> detailView;
 }
-
+-(void)popupVisibilityChanged:(BOOL)newVal;
 @end
 
 #endif
diff --git a/iphone/Classes/TiUIiPadSplitWindowProxy.m b/iphone/Classes/TiUIiPadSplitWindowProxy.m
@@ -54,6 +54,55 @@ -(void)setToolbar:(id)items withObject:(id)properties
 	[(TiUIiPadSplitWindow*)[self view] setToolbar:items withObject:properties];
 }
 
+-(void)popupVisibilityChanged:(BOOL)newVal
+{
+    [self replaceValue:NUMBOOL(newVal) forKey:@"masterPopupVisibile" notification:NO];
+    TiViewProxy* masterProxy = [self valueForUndefinedKey:@"masterView"];
+    if ([masterProxy isKindOfClass:[TiWindowProxy class]]) {
+        if (newVal) {
+            [(TiWindowProxy*) masterProxy gainFocus];
+        } else {
+            [(TiWindowProxy*) masterProxy resignFocus];
+        }
+    }
+}
+
+-(void)gainFocus
+{
+    TiViewProxy* masterProxy = [self valueForUndefinedKey:@"masterView"];
+    TiViewProxy* detailProxy = [self valueForUndefinedKey:@"detailView"];
+    if ([detailProxy isKindOfClass:[TiWindowProxy class]]) {
+        [(TiWindowProxy*) detailProxy gainFocus];
+    }
+
+    if ([masterProxy isKindOfClass:[TiWindowProxy class]]) {
+        id showMasterInPortrait = [self valueForUndefinedKey:@"showMasterInPortrait"];
+        if ([TiUtils boolValue:showMasterInPortrait def:NO]) {
+            [(TiWindowProxy*) masterProxy gainFocus];
+        } else {
+            TiThreadPerformOnMainThread(^{
+                UIInterfaceOrientation curOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+                if (UIInterfaceOrientationIsLandscape(curOrientation)) {
+                    [(TiWindowProxy*) masterProxy gainFocus];
+                }
+            }, YES);
+        }
+    }
+    [super gainFocus];
+}
+
+-(void)resignFocus
+{
+    TiViewProxy* masterProxy = [self valueForUndefinedKey:@"masterView"];
+    TiViewProxy* detailProxy = [self valueForUndefinedKey:@"detailView"];
+    if ([detailProxy isKindOfClass:[TiWindowProxy class]]) {
+        [(TiWindowProxy*) detailProxy resignFocus];
+    }
+    if ([masterProxy isKindOfClass:[TiWindowProxy class]]) {
+        [(TiWindowProxy*) masterProxy resignFocus];
+    }
+    [super resignFocus];
+}
 
 -(void)setDetailView:(id<NSObject,TiOrientationController>)newDetailView
 {
@@ -139,6 +188,24 @@ -(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOr
     if ([self viewAttached]) {
         [[(TiUIiPadSplitWindow*)[self view] controller] didRotateFromInterfaceOrientation:fromInterfaceOrientation];
     }
+
+    if (focussed) {
+        TiViewProxy* masterProxy = [self valueForUndefinedKey:@"masterView"];
+        if ([masterProxy isKindOfClass:[TiWindowProxy class]]) {
+            BOOL showMaster = [TiUtils boolValue:[self valueForUndefinedKey:@"showMasterInPortrait"] def:NO];
+            if (!showMaster) {
+                UIInterfaceOrientation curOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+                showMaster = UIInterfaceOrientationIsLandscape(curOrientation);
+            }
+            if (showMaster) {
+                [(TiWindowProxy*) masterProxy gainFocus];
+            } else {
+                [(TiWindowProxy*) masterProxy resignFocus];
+            }
+        }
+
+    }
+
     [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 }
 

diff --git a/iphone/Classes/TiWindowProxy.m b/iphone/Classes/TiWindowProxy.m
@@ -527,10 +527,8 @@ -(void)viewDidAppear:(BOOL)animated
     if (isModal && opening) {
         [self windowDidOpen];
     }
-    if (controller != nil) {
-        if (tab == nil) {
-            [self gainFocus];
-        }
+    if (controller != nil && !self.isManaged) {
+        [self gainFocus];
     }
 }
 -(void)viewDidDisappear:(BOOL)animated