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

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBrowserWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBrowserWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="fileSearchView_" destination="eJO-4K-8Fw" id="eOY-0e-9xQ"/>
                 <outlet property="fileUploadPanel" destination="iH2-4t-6uG" id="zAQ-Xv-eYu"/>
@@ -24,7 +24,7 @@
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="632" y="533" width="1280" height="800"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <value key="minSize" type="size" width="640" height="640"/>
             <view key="contentView" id="WVd-Ye-yWx">
                 <rect key="frame" x="0.0" y="0.0" width="1280" height="800"/>
@@ -34,7 +34,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="1280" height="786"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kjc-aQ-qNb" customClass="KMToolbarRightView" customModule="PDF_Master" customModuleProvider="target">
+                            <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kjc-aQ-qNb" customClass="KMToolbarRightView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="208" y="481" width="163" height="96"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </customView>
@@ -47,69 +47,69 @@
             </connections>
             <point key="canvasLocation" x="21" y="144"/>
         </window>
-        <customView id="xy6-xE-uD2" customClass="KMToolbarRightView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="xy6-xE-uD2" customClass="KMToolbarRightView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="418" height="55"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Dg-JJ-OII">
                     <rect key="frame" x="5" y="16" width="24" height="24"/>
-                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="KMImageNameNewHomeUpload" imagePosition="only" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="cwz-Jf-Dxh">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
                     <constraints>
                         <constraint firstAttribute="width" constant="24" id="d4F-pL-KC1"/>
                         <constraint firstAttribute="height" constant="24" id="lmD-tp-Y3b"/>
                     </constraints>
+                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="KMImageNameNewHomeUpload" imagePosition="only" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="cwz-Jf-Dxh">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
                     <connections>
                         <action selector="homeUploadButtonAction:" target="p5u-KH-T9i" id="7yZ-L4-Fd4"/>
                     </connections>
                 </button>
                 <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ecn-iD-Q3p">
                     <rect key="frame" x="37" y="16" width="24" height="24"/>
-                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="KMImageNameNewHomeRefresh" imagePosition="only" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="Q9D-Q5-JxQ">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
                     <constraints>
                         <constraint firstAttribute="width" constant="24" id="Y9O-oD-K3o"/>
                         <constraint firstAttribute="height" constant="24" id="kuH-aK-X1e"/>
                     </constraints>
+                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="KMImageNameNewHomeRefresh" imagePosition="only" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="Q9D-Q5-JxQ">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
                     <connections>
                         <action selector="homeRefreshButtonAction:" target="p5u-KH-T9i" id="I7E-Dx-58D"/>
                     </connections>
                 </button>
                 <popUpButton hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EiE-T7-R1c">
                     <rect key="frame" x="70" y="12" width="86" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="23" id="3Iz-sa-LkT"/>
+                        <constraint firstAttribute="width" constant="80" id="WiQ-Aq-6Wu"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="left" lineBreakMode="truncatingTail" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="x9L-D7-UiR">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
                         <menu key="menu" id="zky-xE-ZaB"/>
                     </popUpButtonCell>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="23" id="3Iz-sa-LkT"/>
-                        <constraint firstAttribute="width" constant="80" id="WiQ-Aq-6Wu"/>
-                    </constraints>
                     <connections>
                         <action selector="homeMenuSortAction:" target="p5u-KH-T9i" id="osi-Y3-cTf"/>
                     </connections>
                 </popUpButton>
                 <popUpButton hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z1h-ey-jyH">
                     <rect key="frame" x="157" y="12" width="91" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="85" id="UE2-sw-btb"/>
+                        <constraint firstAttribute="height" constant="23" id="fmL-vM-z9Z"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="left" lineBreakMode="truncatingTail" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9PT-HP-E0F">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
                         <menu key="menu" id="k6R-yO-KKf"/>
                     </popUpButtonCell>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="85" id="UE2-sw-btb"/>
-                        <constraint firstAttribute="height" constant="23" id="fmL-vM-z9Z"/>
-                    </constraints>
                     <connections>
                         <action selector="homeMenuFilterAction:" target="p5u-KH-T9i" id="W2m-GX-SpP"/>
                     </connections>
                 </popUpButton>
-                <searchField hidden="YES" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cHy-Nv-Dx0">
+                <searchField hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cHy-Nv-Dx0">
                     <rect key="frame" x="252" y="17" width="154" height="22"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="154" id="21w-Ts-2vx"/>
@@ -145,25 +145,25 @@
             </connections>
             <point key="canvasLocation" x="104.5" y="581.5"/>
         </customView>
-        <customView id="p5u-KH-T9i" customClass="KMToolbarRightView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="p5u-KH-T9i" customClass="KMToolbarRightView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="267" height="45"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
             <subviews>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="7AP-ao-9XP">
                     <rect key="frame" x="251" y="11" width="0.0" height="24"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Icon_other_avatar_false" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="0Ic-7f-T5r">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="JXM-7W-E4M"/>
                         <constraint firstAttribute="width" id="bTP-JL-8Nw"/>
                     </constraints>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Icon_other_avatar_false" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="0Ic-7f-T5r">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
                     <connections>
                         <action selector="userInfoButtonAction:" target="xy6-xE-uD2" id="UcG-2p-rY4"/>
                     </connections>
                 </button>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="WXF-Ar-JGk" customClass="KMSegmentedBox" customModule="PDF_Master" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="WXF-Ar-JGk" customClass="KMSegmentedBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="153" y="11" width="94" height="24"/>
                     <view key="contentView" id="pfi-aZ-YRi">
                         <rect key="frame" x="0.0" y="0.0" width="94" height="24"/>
@@ -179,7 +179,7 @@
                                         </constraints>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="icon_button_upgrade" id="Wx4-fK-h42"/>
                                     </imageView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7Vr-Dd-FWW">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7Vr-Dd-FWW">
                                         <rect key="frame" x="6" y="4" width="78" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Upgrade" id="41X-ZH-ABW">
                                             <font key="font" metaFont="system"/>
@@ -252,11 +252,11 @@
             </connections>
             <point key="canvasLocation" x="-3.5" y="718.5"/>
         </customView>
-        <customView id="eJO-4K-8Fw" userLabel="Management Search View" customClass="KMFileSearchView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="eJO-4K-8Fw" userLabel="Management Search View" customClass="KMFileSearchView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="145" height="22"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fpA-OK-Dmu">
+                <textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fpA-OK-Dmu">
                     <rect key="frame" x="0.0" y="0.0" width="141" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" borderStyle="bezel" bezelStyle="round" id="Uh2-C6-6bu">
@@ -312,18 +312,18 @@
             </connections>
             <point key="canvasLocation" x="43" y="538"/>
         </customView>
-        <window title="Panel" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="iH2-4t-6uG" userLabel="Progress Panel" customClass="KMUploadFilePanel" customModule="PDF_Master" customModuleProvider="target">
+        <window title="Panel" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="iH2-4t-6uG" userLabel="Progress Panel" customClass="KMUploadFilePanel" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="1127" y="748" width="369" height="111"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <value key="minSize" type="size" width="234" height="87"/>
             <value key="maxSize" type="size" width="235" height="88"/>
             <view key="contentView" id="tjv-WI-5S2">
                 <rect key="frame" x="0.0" y="0.0" width="369" height="111"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qnn-nL-aSY">
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qnn-nL-aSY">
                         <rect key="frame" x="17" y="74" width="132" height="17"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="Ggh-Y3-dbT">
@@ -332,7 +332,7 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d0C-39-EiO" userLabel="Static Text - left Files…">
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d0C-39-EiO" userLabel="Static Text - left Files…">
                         <rect key="frame" x="276" y="67" width="76" height="14"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="odO-pQ-8fS">
@@ -366,12 +366,12 @@ Gw
             </connections>
             <point key="canvasLocation" x="-80" y="1015"/>
         </window>
-        <customView id="zbC-Pu-Vky" userLabel="TabBar" customClass="KMTabStripView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="zbC-Pu-Vky" userLabel="TabBar" customClass="KMTabStripView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="483" height="40"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
             <subviews>
-                <button hidden="YES" imageHugsTitle="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="akd-QH-92I" customClass="NewTabButton">
-                    <rect key="frame" x="295" y="0.0" width="40" height="27"/>
+                <button hidden="YES" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="akd-QH-92I" customClass="NewTabButton">
+                    <rect key="frame" x="295" y="6" width="24" height="24"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="PTU-yU-XC9">
                         <behavior key="behavior" lightByContents="YES"/>
@@ -390,7 +390,7 @@ Gw
         <image name="Icon_other_avatar_false" width="24" height="24"/>
         <image name="KMImageNameNewHomeRefresh" width="24" height="24"/>
         <image name="KMImageNameNewHomeUpload" width="24" height="24"/>
-        <image name="NSStopProgressFreestandingTemplate" width="20" height="20"/>
+        <image name="NSStopProgressFreestandingTemplate" width="15" height="15"/>
         <image name="icon_button_upgrade" width="87" height="24"/>
         <image name="search_author" width="22" height="18"/>
         <image name="search_name" width="22" height="18"/>

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

@@ -14,7 +14,7 @@ class KMTabStripView: CTTabStripView {
         
         if self.addTabButton != nil {
             self.addTabButton.wantsLayer = true
-            self.addTabButton.layer?.cornerRadius = 8
+            self.addTabButton.layer?.cornerRadius = 4
 //            self.addTabButton.toolTip = String(format: "%@(%@O)", KMLocalizedString("Open File", nil),kCommandString)
             
             let view = KMCoverButton()
@@ -28,7 +28,7 @@ class KMTabStripView: CTTabStripView {
 
             view.coverAction = { [weak self] button, action in
                 if (action == .enter) {
-                    var color = NSColor(white: 0.75, alpha: 1)
+                    var color = NSColor(red: 237/255.0, green: 238/255.0, blue: 240/255.0, alpha: 1)
                     if KMAppearance.isDarkMode() {
                         color = NSColor(white: 0.35, alpha: 1)
                     }

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripController.m

@@ -986,7 +986,7 @@ const NSTimeInterval kAnimationDuration = 0.125;
 		// so we don't have to check it against the available space. We do need
 		// to make sure we put it after any placeholder.		
 		CGFloat maxTabX = MAX(offset, NSMaxX(placeholderFrame_) - kTabOverlap);
-		newTabNewFrame.origin = NSMakePoint(maxTabX + kNewTabButtonOffset, 0);		
+		newTabNewFrame.origin = NSMakePoint(maxTabX + kNewTabButtonOffset, 3);		
 //		newTabNewFrame.origin = NSMakePoint(offset, 0);
 //		newTabNewFrame.origin.x = MAX(newTabNewFrame.origin.x, 
 //									  NSMaxX(placeholderFrame_)) + kNewTabButtonOffset;