marinofaggiana 4 年之前
父節點
當前提交
9851ffbb2b
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 3 1
      iOSClient/Menu/NCMenu.swift
  2. 1 1
      iOSClient/Utility/NCPopupViewController.swift

+ 3 - 1
iOSClient/Menu/NCMenu.swift

@@ -88,10 +88,12 @@ class NCMenu: UITableViewController {
 }
 extension NCMenu: FloatingPanelControllerDelegate {
 
+#if !EXTENSION
     func floatingPanel(_ vc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout? {
         return NCMenuFloatingPanelLayout(height: self.actions.count * 60 + Int((UIApplication.shared.keyWindow?.rootViewController!.view.safeAreaInsets.bottom)!))
     }
-
+#endif
+    
     func floatingPanel(_ vc: FloatingPanelController, behaviorFor newCollection: UITraitCollection) -> FloatingPanelBehavior? {
         return NCMenuFloatingPanelBehavior()
     }

+ 1 - 1
iOSClient/Utility/NCPopupViewController.swift

@@ -21,7 +21,7 @@
 //
 import UIKit
 
-public protocol NCPopupViewControllerDelegate: class {
+public protocol NCPopupViewControllerDelegate: AnyObject {
     
     func popupViewControllerDidDismissByTapGesture(_ sender: NCPopupViewController)
 }