【综合】批量转档控制器item大小不走代理问题修复

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -273,21 +273,6 @@
                   endingLineNumber = "332"
                   offsetFromSymbolStart = "299">
                </Location>
-               <Location
-                  uuid = "4AA5DDA9-7119-40D7-89B4-F368372F819A - 89e3ff688b88713e"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditPDFTextManager.setFontAlignment(alignment: __C.NSTextAlignment) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "332"
-                  endingLineNumber = "332"
-                  offsetFromSymbolStart = "192">
-               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.swift

@@ -32,15 +32,9 @@ class KMConvertCollectionViewHeader: KMBaseXibView{
     
     override func awakeFromNib() {
         super.awakeFromNib()
-        indicateLabel.font = NSFont.boldSystemFont(ofSize: 14)
-        indicateLabel.textColor = KMAppearance.Layout.h0Color()
-        indicateLabel.stringValue = NSLocalizedString("Convert", comment: "")
-        infoLabel.font = NSFont.boldSystemFont(ofSize: 11)
-        infoLabel.textColor = KMAppearance.Interactive.m0Color()
-        infoLabel.stringValue = NSLocalizedString("Upgrade to Pro", comment: "")
-        infoLabel.toolTip = NSLocalizedString("Upgrade to Pro", comment: "")
-        containerView.wantsLayer = true
-        containerView.layer?.cornerRadius = 12
+
+//        containerView.wantsLayer = true
+//        containerView.layer?.cornerRadius = 12
         //        if IAPProductsManager.defaultManager().isAvailableAdvancedPDFToOffice {
         //            containerView.isHidden = true
         //        }
@@ -49,23 +43,33 @@ class KMConvertCollectionViewHeader: KMBaseXibView{
 //        NotificationCenter.default.addObserver(self, selector: #selector(IAPProductRestoreFinishedNotification(notification:)), name: NSNotification.Name(rawValue: KMIAPProductRestoreFinishedNotification), object: nil)
     }
     
+    override func setup() {
+//        indicateLabel.font = NSFont.boldSystemFont(ofSize: 14)
+//        indicateLabel.textColor = KMAppearance.Layout.h0Color()
+//        indicateLabel.stringValue = NSLocalizedString("Convert", comment: "")
+//        infoLabel.font = NSFont.boldSystemFont(ofSize: 11)
+//        infoLabel.textColor = KMAppearance.Interactive.m0Color()
+//        infoLabel.stringValue = NSLocalizedString("Upgrade to Pro", comment: "")
+//        infoLabel.toolTip = NSLocalizedString("Upgrade to Pro", comment: "")
+    }
+    
     override func mouseUp(with event: NSEvent) {
         super.mouseUp(with: event)
         let point = event.locationInWindow
         let newPoint = convert(point, from: nil)
-        if self.containerView.frame.contains(newPoint) {
+//        if let data = self.containerView?.frame.contains(newPoint), data {
 //            if !IAPProductsManager.defaultManager().isAvailableAdvancedPDFToOffice {
-                self.convertHeaderClickedCallBack?()
+//                self.convertHeaderClickedCallBack?()
 //            }
-        }
+//        }
     }
     
     @objc func IAPProductPurchasedNotification(notification: Notification) {
-        containerView.isHidden = true
+//        containerView.isHidden = true
     }
     
     @objc func IAPProductRestoreFinishedNotification(notification: Notification) {
-        containerView.isHidden = true
+//        containerView.isHidden = true
     }
     
 }

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -285,6 +285,7 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCo
         
         self.collectionView.register(KMConvertCollectionViewHeader.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMAdvertisementCollectionViewItem"))
         self.collectionView.register(KMBatchoperateConvertCollectionViewItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBatchoperateConvertCollectionViewItem"))
+        self.collectionView.register(KMConvertCollectionViewHeader.self, forSupplementaryViewOfKind: NSCollectionView.elementKindSectionHeader, withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "convertHeader"))
         
         collectionView.enclosingScrollView?.drawsBackground = false
         let v = NSView(frame: NSRect(x: 0, y: 0, width: 100, height: 100))
@@ -518,17 +519,6 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCo
     func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
         return dataSourcesArray!.count
     }
-    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
-        let item = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBatchoperateConvertCollectionViewItem"), for: indexPath) as! KMBatchoperateConvertCollectionViewItem
-        item.updateInterface(dataSourcesArray![indexPath.item])
-        return item
-    }
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
-        return NSSize(width: 74, height: 180)
-    }
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
-        return NSEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
-    }
     func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         if let indexPath = indexPaths.first {
             convertType = dataSourcesArray![indexPath.item]
@@ -536,15 +526,15 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCo
         }
     }
     func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> NSSize {
-        return NSSize(width: 10000, height: 100)
+        return NSSize(width: 10000, height: 50)
     }
     func collectionView(_ collectionView: NSCollectionView, viewForSupplementaryElementOfKind kind: NSCollectionView.SupplementaryElementKind, at indexPath: IndexPath) -> NSView {
-        let view = collectionView.makeSupplementaryView(ofKind: kind, withIdentifier:NSUserInterfaceItemIdentifier(rawValue: "convertHeader") , for: indexPath) as! KMConvertCollectionViewHeader
+        let view = collectionView.makeSupplementaryView(ofKind: kind, withIdentifier:NSUserInterfaceItemIdentifier(rawValue: "convertHeader") , for: indexPath) as? KMConvertCollectionViewHeader
         
-        view.convertHeaderClickedCallBack = {
+        view?.convertHeaderClickedCallBack = {
             self.convertActionVC()
         }
-        return view
+        return view ?? NSView()
     }
     
     func intConvertType(num: Int) -> KMConvertWithPDFType {
@@ -588,3 +578,17 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCo
         return type!
     }
 }
+
+extension KMBatchOperateConvertViewController: NSCollectionViewDelegateFlowLayout {
+    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
+        let item = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBatchoperateConvertCollectionViewItem"), for: indexPath) as! KMBatchoperateConvertCollectionViewItem
+        item.updateInterface(dataSourcesArray![indexPath.item])
+        return item
+    }
+    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
+        return NSSize(width: 74, height: 80)
+    }
+    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
+        return NSEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
+    }
+}