Bläddra i källkod

【注释回复】UI调整

tangchao 1 dag sedan
förälder
incheckning
b6e86c688b

+ 3 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFooterCellView.swift

@@ -105,6 +105,9 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
         self.operationButton.action = #selector(operationAction)
         
         self.updateUI(expand: false, animated: false)
+        
+        self.commentNumberLabel.font = .SFProTextRegularFont(11)
+        self.commentNumberLabel.textColor = NSColor(hex: "#43474D")
     }
     
     func updateUI(expand: Bool, animated: Bool) {

+ 4 - 4
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFooterCellView.xib

@@ -38,7 +38,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="nRc-Dh-PEL" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="16" y="32" width="425" height="32"/>
+                                <rect key="frame" x="16" y="28" width="425" height="32"/>
                                 <view key="contentView" id="fIS-wd-lpj">
                                     <rect key="frame" x="1" y="1" width="423" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -63,14 +63,14 @@
                                 </constraints>
                             </box>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d2W-fA-bBI">
-                                <rect key="frame" x="396" y="4" width="45" height="16"/>
+                                <rect key="frame" x="396" y="0.0" width="45" height="16"/>
                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="p4p-ds-vYh">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqz-a4-FAh">
-                                <rect key="frame" x="339" y="4" width="45" height="16"/>
+                                <rect key="frame" x="339" y="0.0" width="45" height="16"/>
                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ZIH-CU-juN">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -81,7 +81,7 @@
                             <constraint firstAttribute="trailing" secondItem="nRc-Dh-PEL" secondAttribute="trailing" constant="12" id="0Ur-tE-yDr"/>
                             <constraint firstItem="cqz-a4-FAh" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="12" id="CkL-Wf-SbD"/>
                             <constraint firstItem="d2W-fA-bBI" firstAttribute="leading" secondItem="cqz-a4-FAh" secondAttribute="trailing" constant="12" id="EQb-gf-Dsq"/>
-                            <constraint firstItem="nRc-Dh-PEL" firstAttribute="top" secondItem="fr9-7p-tnW" secondAttribute="top" id="JUc-qE-48C"/>
+                            <constraint firstItem="nRc-Dh-PEL" firstAttribute="top" secondItem="fr9-7p-tnW" secondAttribute="top" constant="4" id="JUc-qE-48C"/>
                             <constraint firstItem="nRc-Dh-PEL" firstAttribute="leading" secondItem="fr9-7p-tnW" secondAttribute="leading" constant="16" id="Sn4-P3-Sde"/>
                             <constraint firstItem="d2W-fA-bBI" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="12" id="WS7-OZ-Krf"/>
                             <constraint firstAttribute="trailing" secondItem="d2W-fA-bBI" secondAttribute="trailing" constant="12" id="snO-R5-W1k"/>

+ 8 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteReplyCellView.swift

@@ -32,9 +32,16 @@ class KMNoteReplyCellView: NSTableCellView, NibLoadable {
     override func awakeFromNib() {
         super.awakeFromNib()
         self.backgroundBox.borderWidth = 0
+
+        self.titleLabel.textColor = KMAppearance.Layout.h1Color()
+        self.timeLabel.font = .SFProTextSemiboldFont(14)
         
+        self.timeLabel.font = .SFProTextRegularFont(12)
+        self.timeLabel.textColor = NSColor(hex: "#999999")
         self.timeLabel.lineBreakMode = .byTruncatingTail
-        self.titleLabel.textColor = .black
+        
+        self.contentLabel.font = .SFProTextRegularFont(14)
+        self.contentLabel.textColor = KMAppearance.KM_757780_Color()
         
         self.moreBox.borderWidth = 0
         self.moreButton.stringValue = ""

+ 3 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTableViewCell.swift

@@ -115,8 +115,10 @@ class KMNoteTableViewCell: NSTableCellView {
         self.timeLabel.cell?.truncatesLastVisibleLine = true
         self.pageLabel.textColor = KMAppearance.Layout.h2Color()
         
+        self.noteContentLabel.isEditable = false
         self.noteContentBox.borderWidth = 1.0
-        self.noteContentBox.borderColor = KMAppearance.KM_477EDE_ColorDarkChange01()
+//        self.noteContentBox.borderColor = KMAppearance.KM_477EDE_ColorDarkChange01()
+        self.noteContentBox.borderColor = KMAppearance.Layout.b15Color()
         self.noteContentBox.cornerRadius = 1.0
         self.noteContentBox.fillColor = KMAppearance.Layout.l1Color()
         

+ 6 - 6
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/LeftSideView.xib

@@ -1206,7 +1206,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mv9-xH-dgE">
-                                                <rect key="frame" x="0.0" y="12" width="177" height="61"/>
+                                                <rect key="frame" x="0.0" y="12" width="219" height="61"/>
                                                 <subviews>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8iM-cD-LbJ">
                                                         <rect key="frame" x="0.0" y="43" width="16" height="16"/>
@@ -1223,13 +1223,13 @@
                                                         </connections>
                                                     </button>
                                                     <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="urW-lZ-sYJ">
-                                                        <rect key="frame" x="18" y="8" width="159" height="28"/>
+                                                        <rect key="frame" x="18" y="8" width="201" height="28"/>
                                                         <view key="contentView" id="3Zt-zx-JkS">
-                                                            <rect key="frame" x="1" y="1" width="157" height="26"/>
+                                                            <rect key="frame" x="1" y="1" width="199" height="26"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="hDI-gM-mdu">
-                                                                    <rect key="frame" x="5" y="5" width="147" height="17"/>
+                                                                    <rect key="frame" x="5" y="5" width="189" height="17"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="17" id="KpE-VJ-Nbx"/>
                                                                     </constraints>
@@ -1296,7 +1296,7 @@
                                             <constraint firstAttribute="trailing" secondItem="udQ-rE-Njy" secondAttribute="trailing" constant="80" id="1h3-oY-1aP"/>
                                             <constraint firstItem="zkB-0O-cuV" firstAttribute="leading" secondItem="3TS-lp-G7v" secondAttribute="leading" constant="16" id="809-dl-a9T"/>
                                             <constraint firstItem="mv9-xH-dgE" firstAttribute="top" secondItem="udQ-rE-Njy" secondAttribute="bottom" constant="8" id="DIv-1w-hI5"/>
-                                            <constraint firstItem="Pnc-2Q-X2x" firstAttribute="leading" secondItem="mv9-xH-dgE" secondAttribute="trailing" constant="4" id="DVe-2C-VRp"/>
+                                            <constraint firstItem="Pnc-2Q-X2x" firstAttribute="leading" secondItem="mv9-xH-dgE" secondAttribute="trailing" constant="-38" id="DVe-2C-VRp"/>
                                             <constraint firstItem="udQ-rE-Njy" firstAttribute="top" secondItem="3TS-lp-G7v" secondAttribute="top" constant="12" id="P1e-sT-bb4"/>
                                             <constraint firstAttribute="trailing" secondItem="btZ-nY-HvQ" secondAttribute="trailing" constant="16" id="Rse-jw-WVt"/>
                                             <constraint firstAttribute="trailing" secondItem="Pnc-2Q-X2x" secondAttribute="trailing" constant="40" id="Sjk-E8-SlY"/>
@@ -1362,7 +1362,7 @@
         <image name="KMImageNameUXIconBtnSidebarZoominNor" width="16" height="16"/>
         <image name="KMImageNameUXIconBtnSidebarZoomoutNor" width="16" height="16"/>
         <namedColor name="KMColor_Layout_H2">
-            <color red="0.45882352941176469" green="0.46666666666666667" blue="0.50196078431372548" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.458823561668396" green="0.46666663885116577" blue="0.50196081399917603" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>