【综合】工具栏整理代码

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarItemView.swift

@@ -343,13 +343,10 @@ extension KMToolbarItemView {
     override func mouseEntered(with event: NSEvent) {
         super.mouseEntered(with: event)
         
-        guard let _window = self.window else {
+        if let data = self.window?.isKeyWindow, !data {
             return
         }
         
-        if (!_window.isKeyWindow) {
-            return
-        }
         if (self.itemIdentifier == KMToolbarDividerItemIdentifier || self.customizeView != nil || self.image == nil) {
             return
         }
@@ -402,10 +399,7 @@ extension KMToolbarItemView {
             self.needExpandButton.image = NSImage(named: "KMImageNameUXIconBtnTriDownNor")
         }
         
-        guard let _window = self.window else {
-            return
-        }
-        if (!_window.isKeyWindow) {
+        if let data = self.window?.isKeyWindow, !data {
             return
         }
         

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift

@@ -70,16 +70,11 @@ private let KMToolbarItemSpace = 8.0
     }()
     private lazy var leftView: NSView = {
         let view = NSView()
-//        view.wantsLayer = true
-//        view.layer?.backgroundColor = NSColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0 , alpha: 1).cgColor
         return view
     }()
     
-    private class KMToolbarView_rightView: NSView {}
     private lazy var rightView: NSView = {
-        let view = KMToolbarView_rightView()
-//        view.wantsLayer = true
-//        view.layer?.backgroundColor = NSColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0, alpha: 1).cgColor
+        let view = NSView()
         return view
     }()
     
@@ -107,13 +102,6 @@ private let KMToolbarItemSpace = 8.0
         self._addTrackingArea()
         
         NotificationCenter.default.addObserver(self, selector: #selector(toolbarCustomChangeNotification), name: KMToolbarCustomChangeNotification, object: nil)
-        
-//        self.leftView.wantsLayer = true
-//        self.contentView.wantsLayer = true
-//        self.rightView.wantsLayer = true
-//        self.leftView.layer?.backgroundColor = NSColor.red.cgColor
-//        self.contentView.layer?.backgroundColor = NSColor.blue.cgColor
-//        self.rightView.layer?.backgroundColor = NSColor.green.cgColor
     }
     
     override func menu(for event: NSEvent) -> NSMenu? {
@@ -160,11 +148,6 @@ private let KMToolbarItemSpace = 8.0
         self.addTrackingArea(trackingArea)
     }
     
-    override func mouseMoved(with event: NSEvent) {
-//        self.window?.mouseMoved(with: event)
-        super.mouseMoved(with: event)
-    }
-    
     @objc private func _moreButtonAction() {
         let menu = NSMenu()
         for item in self._invisibleItems {
@@ -422,38 +405,6 @@ private let KMToolbarItemSpace = 8.0
                 }
                 
                 self.leftView.addSubview(data)
-//                if (lastItem != nil) {
-//                    if (i == itemIdentifiers.count - 1) {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.mas_equalTo()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
-//                            make?.right.equalTo()(self.leftView.mas_right)?.offset()(0)
-//                        })
-//                    } else {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.mas_equalTo()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
-//                        })
-//                    }
-//
-//                } else {
-//                    if (i == itemIdentifiers.count - 1) {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.mas_equalTo()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(self.leftView.mas_left)?.offset()(KMToolbarItemSpace)
-//                            make?.right.equalTo()(self.leftView.mas_right)?.offset()(-20)
-//                        })
-//                    } else {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.mas_equalTo()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(KMToolbarItemSpace)
-//                        })
-//                    }
-//                }
                 iWidth += data.itemWidth
                 if lastItem != nil {
                     // + 前一个的间距
@@ -482,11 +433,6 @@ private let KMToolbarItemSpace = 8.0
             if (self.rightView.superview == nil) {
                 self.addSubview(self.rightView)
             }
-//            self.rightView.mas_remakeConstraints { make in
-//                make?.right.equalTo()(self.mas_right)?.offset()(0)
-//                make?.top.equalTo()(self.mas_top)?.offset()(0)
-//                make?.bottom.equalTo()(self.mas_bottom)?.offset()(0)
-//            }
             
             var lastItem: KMToolbarItemView?
             for i in 0 ..< itemIdentifiers.count {
@@ -509,37 +455,6 @@ private let KMToolbarItemSpace = 8.0
                 }
                 
                 self.rightView.addSubview(data)
-//                if (lastItem != nil) {
-//                    if (i == itemIdentifiers.count - 1) {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.offset()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
-//                            make?.right.equalTo()(self.rightView.mas_right)?.offset()(-KMToolbarItemSpace)
-//                        })
-//                    } else {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.offset()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
-//                        })
-//                    }
-//                } else {
-//                    if (i == itemIdentifiers.count - 1) {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.height.offset()(40)
-//                            make?.left.equalTo()(self.rightView.mas_left)?.offset()(KMToolbarItemSpace)
-//                            make?.right.equalTo()(self.rightView.mas_right)?.offset()(-KMToolbarItemSpace)
-//                        })
-//                    } else {
-//                        item?.mas_makeConstraints({ make in
-//                            make?.height.offset()(40)
-//                            make?.centerY.mas_equalTo()(0)
-//                            make?.left.equalTo()(0)
-//                        })
-//                    }
-//                }
                 iWidth += data.itemWidth
                 if lastItem != nil {
                     // + 前一个的间距
@@ -734,11 +649,7 @@ private let KMToolbarItemSpace = 8.0
             return
         }
         let moreButtonWidth = 18.0
-//        let leftButtonWidth = 10.0
-        
-//        let leftW = NSWidth(self.leftView.frame)
-//        let contentW = NSWidth(self.contentView.frame)
-//        let rightW = NSWidth(self.rightView.frame)
+
         let leftW = self._leftWidth
         let contentW = self._centerWidth
         let rightW = self._rightWidth