【综合】多页签 ”+“ 缺悬停状态(已修复)

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

@@ -254,8 +254,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "523"
-            endingLineNumber = "523"
+            startingLineNumber = "524"
+            endingLineNumber = "524"
             landmarkName = "openBlankPage(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -286,8 +286,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "520"
-            endingLineNumber = "520"
+            startingLineNumber = "521"
+            endingLineNumber = "521"
             landmarkName = "openBlankPage(_:)"
             landmarkType = "7">
          </BreakpointContent>

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -179,6 +179,7 @@ import Cocoa
         
         // MARK TODO: + 号开启
 //        self.browser.addHomeTabContents()
+        self.tabStripView?.addTabButton?.layer?.backgroundColor = .clear
         self.km_browser?.addNewTabContents()
     }
     

PDF Office/PDF Master/Class/ChromiumTabs/KMTabStripView.swift

@@ -12,6 +12,31 @@ class KMTabStripView: CTTabStripView {
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        
+        if self.addTabButton != nil {
+            self.addTabButton.wantsLayer = true
+            self.addTabButton.layer?.cornerRadius = 8
+//            self.addTabButton.toolTip = String(format: "%@(%@O)", KMLocalizedString("Open File", nil),kCommandString)
+            
+            let view = KMCoverButton()
+            self.addTabButton.addSubview(view)
+            view.km_add_inset_constraint()
+            view.wantsLayer = true
+            view.title = ""
+            view.isEnabled = false
+            view.layer?.backgroundColor = .clear
+            view.isBordered = false
+
+            view.coverAction = { [weak self] button, action in
+                if (action == .enter) {
+                    var color = NSColor(white: 0.75, alpha: 1)
+                    if KMAppearance.isDarkMode() {
+                        color = NSColor(white: 0.35, alpha: 1)
+                    }
+                    self?.addTabButton.layer?.backgroundColor = color.cgColor
+                } else if (action == .exit) {
+                    self?.addTabButton.layer?.backgroundColor = .clear
+                }
+            }
+        }
     }
 }

PDF Office/PDF Master/Class/Common/Control/KMCoverButton.swift

@@ -16,7 +16,6 @@ import Cocoa
 @objcMembers
 class KMCoverButton: NSButton {
     
-//    var coverAction: ((KMCoverButton, KMCoverAction) -> Void)?
     var coverAction: ((_ button: KMCoverButton, _ actionType: KMCoverAction) -> Void)?
 
     private var area: NSTrackingArea?

PDF Office/PDF Master/Class/Common/KMCommonDefine.swift

@@ -47,6 +47,11 @@ let KMSelectorCopy = NSSelectorFromString("copy:")
 
 let KMNormalBlankSize = NSMakeSize(595, 842)
 
+let kControlString  = "⌃"
+let kCommandString  = "⌘"
+let kOptionString   = "⌥"
+let kShiftString    = "⇧"
+
 // MARK: - 特定的Block
 
 typealias KMBatchActionBlock = (_ controller: NSWindowController, _ files: [KMFileAttribute]) -> Void

PDF Office/PDF Master/Class/Preference/Controller/NotesPreferences.xib

@@ -31,11 +31,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="4" id="154"/>
                         <accessibilityConnection property="title" destination="3" id="75"/>
-                        <binding destination="84" name="value" keyPath="values.SKFreeTextNoteColor" id="86">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3">
@@ -54,11 +49,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="21" id="155"/>
                         <accessibilityConnection property="title" destination="5" id="80"/>
-                        <binding destination="84" name="value" keyPath="values.SKAnchoredNoteColor" id="92">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5">
@@ -77,11 +67,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="35" id="158"/>
                         <accessibilityConnection property="title" destination="7" id="71"/>
-                        <binding destination="84" name="value" keyPath="values.SKCircleNoteColor" id="88">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7">
@@ -100,11 +85,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="37" id="160"/>
                         <accessibilityConnection property="title" destination="9" id="83"/>
-                        <binding destination="84" name="value" keyPath="values.SKSquareNoteColor" id="101">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9">
@@ -123,11 +103,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="12" id="162"/>
                         <accessibilityConnection property="title" destination="11" id="78"/>
-                        <binding destination="84" name="value" keyPath="values.SKHighlightNoteColor" id="90">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11">
@@ -146,11 +121,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="14" id="163"/>
                         <accessibilityConnection property="title" destination="13" id="68"/>
-                        <binding destination="84" name="value" keyPath="values.SKUnderlineNoteColor" id="96">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="13">
@@ -168,11 +138,6 @@
                     <color key="color" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <connections>
                         <accessibilityConnection property="title" destination="15" id="82"/>
-                        <binding destination="84" name="value" keyPath="values.SKStrikeOutNoteColor" id="103">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="15">
@@ -191,11 +156,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="6" id="157"/>
                         <accessibilityConnection property="title" destination="17" id="72"/>
-                        <binding destination="84" name="value" keyPath="values.SKInkNoteColor" id="105">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="17">
@@ -236,11 +196,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="16" id="156"/>
                         <accessibilityConnection property="title" destination="22" id="67"/>
-                        <binding destination="84" name="value" keyPath="values.SKLineNoteColor" id="99">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="22">
@@ -356,11 +311,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="8" id="159"/>
                         <accessibilityConnection property="title" destination="36" id="81"/>
-                        <binding destination="84" name="value" keyPath="values.SKCircleNoteInteriorColor" id="97">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="36">
@@ -379,11 +329,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="10" id="161"/>
                         <accessibilityConnection property="title" destination="38" id="69"/>
-                        <binding destination="84" name="value" keyPath="values.SKSquareNoteInteriorColor" id="107">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="38">
@@ -402,11 +347,6 @@
                     <connections>
                         <accessibilityConnection property="link" destination="10" id="267"/>
                         <accessibilityConnection property="title" destination="263" id="265"/>
-                        <binding destination="84" name="value" keyPath="values.SKLineNoteInteriorColor" id="272">
-                            <dictionary key="options">
-                                <string key="NSValueTransformerName">NSUnarchiveFromData</string>
-                            </dictionary>
-                        </binding>
                     </connections>
                 </colorWell>
                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="263">
@@ -458,7 +398,6 @@
                     </buttonCell>
                     <connections>
                         <accessibilityConnection property="title" destination="40" id="66"/>
-                        <binding destination="84" name="fontName" keyPath="values.SKAnchoredNoteFontName" id="109"/>
                     </connections>
                 </button>
                 <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="273">

PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -66,3 +66,5 @@
 #import "CPDFAnnotationModel.h"
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"
+
+#import "NewTabButton.h"

PDF Office/PDF Master/PDF_Master Pro-Bridging-Header.h

@@ -49,3 +49,5 @@
 #import "CPDFAnnotationModel.h"
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"
+
+#import "NewTabButton.h"

PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -63,3 +63,5 @@
 #import "CPDFListView.h"
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"
+
+#import "NewTabButton.h"