fix action menu show problem

haiwen · Jun 3, 2018 · a4c589a · a4c589a
1 parent 1d78639
commit a4c589a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/common/Classes/UIViewController+Extend.h b/common/Classes/UIViewController+Extend.h
@@ -36,4 +36,6 @@
 - (BOOL)checkNetworkStatus;
 
 - (void)popupTwoStepVerificationViewHandler:(void (^)(NSString *input,BOOL remember))handler;
+
+- (UIViewController *)topViewControllerIn:(UIViewController*)rootViewRootVC;
 @end
diff --git a/common/Classes/UIViewController+Extend.m b/common/Classes/UIViewController+Extend.m
@@ -236,4 +236,25 @@ - (BOOL)checkNetworkStatus
     return YES;
 }
 
+#pragma mark topViewController
+- (UIViewController *)topViewControllerIn:(UIViewController*)rootViewRootVC {
+    UIViewController *topVC;
+    topVC = [self findTopViewController:rootViewRootVC];
+    while (topVC.presentedViewController) {
+        topVC = [self findTopViewController:topVC.presentedViewController];
+    }
+    return topVC;
+}
+
+- (UIViewController *)findTopViewController:(UIViewController *)vc {
+    if ([vc isKindOfClass:[UINavigationController class]]) {
+        return [self findTopViewController:[(UINavigationController *)vc topViewController]];
+    } else if ([vc isKindOfClass:[UITabBarController class]]) {
+        return [self findTopViewController:[(UITabBarController *)vc selectedViewController]];
+    } else {
+        return vc;
+    }
+    return nil;
+}
+
 @end
diff --git a/seafile/SeafFileViewController.m b/seafile/SeafFileViewController.m
@@ -674,8 +674,9 @@ - (void)showSheetWithTitles:(NSArray*)titles andFromView:(id)view
 
         [actionSheet showFromPoint:point inView:self.navigationController.view arrowDirection:SFActionSheetArrowDirectionTop animated:YES];
     } else {
-        UIView *topView = [[[UIApplication sharedApplication] keyWindow].subviews firstObject];
-        [actionSheet showInView:topView animated:YES];
+        UIViewController *topVC = [self topViewControllerIn:[[[[UIApplication sharedApplication] delegate] window] rootViewController]];
+
+        [actionSheet showInView:topVC.view.window animated:YES];
     }
 }