marinofaggiana 4 年之前
父节点
当前提交
993e63587c

+ 1 - 1
iOSClient/Main/Menu/NCCollectionViewCommon+Menu.swift

@@ -220,7 +220,7 @@ extension NCCollectionViewCommon {
         //
         // VIEW IN FOLDER
         //
-        if layoutKey == k_layout_view_recent {
+        if layoutKey == k_layout_view_recent && appDelegate.activeFileViewInFolder == nil {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_view_in_folder_", comment: ""),

+ 0 - 1
iOSClient/Main/NCCollectionCommon.swift

@@ -133,7 +133,6 @@ class NCCollectionCommon: NSObject, NCSelectDelegate {
         viewController.serverUrl = serverUrl
         viewController.fileName = fileName
         
-        navigationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen
         appDelegate.window.rootViewController?.present(navigationController, animated: true, completion: nil)
     }
 }

+ 1 - 2
iOSClient/Main/NCCollectionViewCommon.swift

@@ -654,10 +654,9 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     func tapMoreGridItem(with objectId: String, namedButtonMore: String, sender: Any) {
         
         guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(objectId) else { return }
-        guard let tabBarController = self.tabBarController else { return }
 
         if namedButtonMore == k_buttonMoreMore {
-            toggleMoreMenu(viewController: tabBarController, metadata: metadata)
+            toggleMoreMenu(viewController: self, metadata: metadata)
         } else if namedButtonMore == k_buttonMoreStop {
             NCNetworking.shared.cancelTransferMetadata(metadata) { }
         }