【2025】【综合】细节完善修正

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Alert/ComponentAlert.swift

@@ -255,6 +255,9 @@ public class ComponentAlert: ComponentBaseXibView {
     }
     
     public func reloadData() {
+        
+        ComponentLibrary.shared.configAlertComponent(properties: _properties)
+        
         self.refreshUI()
         
     }

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Input/ComponentTextarea/ComponentTextarea.swift

@@ -24,6 +24,7 @@ public class ComponentTextarea: ComponentBaseXibView {
     @IBOutlet var contendBox: NSBox!
     @IBOutlet var placeholderLabel: NSTextField!
     
+    @IBOutlet var scrollView: NSScrollView!
     @IBOutlet var textView: ComponentTextView!
     @IBOutlet var textCountLabel: NSTextField!
      
@@ -47,6 +48,8 @@ public class ComponentTextarea: ComponentBaseXibView {
     public override func awakeFromNib() {
         super.awakeFromNib()
         
+        scrollView.scrollerStyle = .overlay
+        
         textView.drawsBackground = false
         textView.delegate = self
         textView.componentDelegate = self

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Input/ComponentTextarea/ComponentTextarea.xib

@@ -10,6 +10,7 @@
             <connections>
                 <outlet property="contendBox" destination="tTI-hd-O6M" id="XKM-OR-mBQ"/>
                 <outlet property="placeholderLabel" destination="BBq-kb-UpR" id="VZE-kX-HJH"/>
+                <outlet property="scrollView" destination="Tm5-i8-1qu" id="UtV-fV-AjY"/>
                 <outlet property="scrollViewBottomConst" destination="gSJ-HP-VzN" id="qtk-Dd-RYa"/>
                 <outlet property="textCountLabel" destination="CsS-4i-87N" id="B72-tb-H8Y"/>
                 <outlet property="textView" destination="6ap-L2-IZG" id="r7d-Wm-qmK"/>
@@ -27,7 +28,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tm5-i8-1qu">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tm5-i8-1qu">
                                 <rect key="frame" x="4" y="24" width="312" height="48"/>
                                 <clipView key="contentView" drawsBackground="NO" id="47F-UF-VwW">
                                     <rect key="frame" x="0.0" y="0.0" width="312" height="48"/>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift

@@ -360,7 +360,7 @@ extension CPDFButtonWidgetAnnotation {
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
-        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: SKAnnotationTextWidgetFontSizeKey)
+        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: CAnnotationActionButtonWidgetFontSizeKey)
     }
     
     class func update(_ annotations: [CPDFButtonWidgetAnnotation], mouseUpAction action: CPDFAction?, PDFView pdfView: CPDFListView?) {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFChoiceWidgetAnnotation+PDFListView.swift

@@ -261,7 +261,7 @@ extension CPDFChoiceWidgetAnnotation {
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
-        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: SKAnnotationTextWidgetFontSizeKey)
+        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: CAnnotationChoiceListWidgetFontSizeKey)
     }
     
     class func updateSelectIndex(_ annotations: [CPDFChoiceWidgetAnnotation], _ index: Int, withPDFView pdfView: CPDFListView?) {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFTextWidgetAnnotation+PDFListView.swift

@@ -16,6 +16,7 @@ import Foundation
         self.isMultiline = false
         
         self.cFont = CPDFTextWidgetAnnotation.defaultFont()
+        self.fontSize = CPDFTextWidgetAnnotation.defaultFontSize()
         
         self.fontColor = CPDFTextWidgetAnnotation.defaultTextColor()
         

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Eraser/KMEraserController.swift

@@ -47,7 +47,7 @@ class KMEraserController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -61,7 +61,7 @@ class KMEraserController: NSViewController {
     func reloadData() {
         let value = CPDFAnnotationConfig.getDefaultFloatValue(forKey: CEraserkNoteLineWidthKey) ?? 7
         
-        let percent: CGFloat = (CGFloat(value) - 1)/17
+        let percent: CGFloat = CGFloat(value)/18
         eraserSlider.properties.percent = percent
         eraserSlider.reloadData()
         
@@ -75,7 +75,7 @@ class KMEraserController: NSViewController {
 extension KMEraserController: ComponentSliderDelegate {
     func componentSliderDidUpdate(_ view: ComponentSlider) {
         if view == eraserSlider {
-            let percent = view.properties.percent * 17 + 1
+            let percent = view.properties.percent * 18
             CPDFAnnotationConfig.setDefaultFloatValue(percent, toKey: CEraserkNoteLineWidthKey)
         }
         
@@ -91,8 +91,8 @@ extension KMEraserController: ComponentSelectDelegate {
             var value = result.stringToCGFloat()
             if value > 18 {
                 value = 18
-            } else if value < 1 {
-                value = 1
+            } else if value < 0 {
+                value = 0
             }
             CPDFAnnotationConfig.setDefaultFloatValue(value, toKey: CEraserkNoteLineWidthKey)
         }
@@ -106,8 +106,8 @@ extension KMEraserController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotationConfig.setDefaultFloatValue(value, toKey: CEraserkNoteLineWidthKey)
             }

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Fill_Tick/FillTickController.swift

@@ -109,7 +109,7 @@ class FillTickController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -236,7 +236,7 @@ class FillTickController: NSViewController {
         colorOpacitySelect.reloadData()
         
         if let value = lineWidth {
-            let percent = (value - 1)/17
+            let percent = value/18
             lineWidthSlider.properties.percent = percent
             
             lineWidthSelect.properties.text = String(format: "%.0f%@", value, " pt")
@@ -343,7 +343,7 @@ extension FillTickController: ComponentSliderDelegate {
             }
              
         } else if view == lineWidthSlider {
-            let percent = view.properties.percent * 17 + 1
+            let percent = view.properties.percent * 18
             CSelfSignAnnotation.updateLineWidth(annotations, percent, withPDFView: pdfView)
             
             if annotations.count == 0 {
@@ -372,8 +372,8 @@ extension FillTickController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CSelfSignAnnotation.updateLineWidth(annotations, value, withPDFView: pdfView)
                 
@@ -398,8 +398,8 @@ extension FillTickController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CSelfSignAnnotation.updateLineWidth(annotations, value, withPDFView: pdfView)
                 

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Line/KMLineController.swift

@@ -133,7 +133,7 @@ class KMLineController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -152,7 +152,7 @@ class KMLineController: NSViewController {
                                                               regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -278,7 +278,7 @@ class KMLineController: NSViewController {
             }
             lineTypeSelector.reloadData()
             
-            let percent = (border.lineWidth - 1)/17
+            let percent = border.lineWidth/18
             lineWidthSlider.properties.percent = percent
             lineWidthSlider.reloadData()
             
@@ -296,7 +296,7 @@ class KMLineController: NSViewController {
                         break
                     }
                 }
-                let percent: CGFloat = (CGFloat(dash) - 1)/17
+                let percent: CGFloat = CGFloat(dash)/18
                 lineDashSlider.properties.percent = percent
                 lineDashSlider.reloadData()
                 
@@ -325,7 +325,7 @@ class KMLineController: NSViewController {
             }
             lineTypeSelector.reloadData()
             
-            let percent = (border.lineWidth - 1)/17
+            let percent = border.lineWidth/18
             lineWidthSlider.properties.percent = percent
             lineWidthSlider.reloadData()
             
@@ -343,7 +343,7 @@ class KMLineController: NSViewController {
                         break
                     }
                 }
-                let percent: CGFloat = (CGFloat(dash) - 1)/17
+                let percent: CGFloat = CGFloat(dash)/18
                 lineDashSlider.properties.percent = percent
                 lineDashSlider.reloadData()
                 
@@ -422,7 +422,7 @@ class KMLineController: NSViewController {
                 } else {
                     let border: CPDFBorder = annotation.border ?? CPDFBorder()
                     
-                    let percent = (border.lineWidth - 1)/17
+                    let percent = border.lineWidth/18
                     lineWidthSlider.properties.percent = percent
                     lineWidthSlider.reloadData()
                     
@@ -447,7 +447,7 @@ class KMLineController: NSViewController {
                         }
                     }
                     
-                    let percent = (dashA - 1)/17
+                    let percent = dashA/18
                     lineDashSlider.properties.percent = percent
                     lineDashSlider.reloadData()
                     
@@ -517,7 +517,7 @@ extension KMLineController: ComponentSliderDelegate {
             }
             
         } else if view == lineWidthSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
             
             if self.lineAnnotations.count > 0 || viewManager?.subToolMode == .Line {
@@ -527,7 +527,7 @@ extension KMLineController: ComponentSliderDelegate {
             }
             
         } else if view == lineDashSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
             
             if self.lineAnnotations.count > 0 || viewManager?.subToolMode == .Line {
@@ -609,8 +609,8 @@ extension KMLineController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
                 
@@ -624,8 +624,8 @@ extension KMLineController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
                 

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Measure/KMMeasureController.swift

@@ -151,7 +151,7 @@ class KMMeasureController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -170,7 +170,7 @@ class KMMeasureController: NSViewController {
                                                               regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -536,7 +536,7 @@ class KMMeasureController: NSViewController {
         
         var percent: CGFloat = 0
         if let value = lineBorderWidth, value > 0 {
-            percent = (value - 1)/17
+            percent = value/18
             lineWidthSlider.properties.percent = percent
             lineWidthSelect.properties.text = String(format: "%.0f%@", value, " pt")
         } else {
@@ -563,7 +563,7 @@ class KMMeasureController: NSViewController {
             if let value = dashPattern {
                 dash = value
             }
-            let percent: CGFloat = (CGFloat(dash) - 1)/17
+            let percent: CGFloat = CGFloat(dash)/18
             lineDashSlider.properties.percent = percent
             lineDashSlider.reloadData()
             
@@ -678,12 +678,12 @@ extension KMMeasureController: ComponentSliderDelegate {
             CPDFMeasureDefaultInfo.update_default_measure_Opacity(annotationType: self.annotationType, value)
             
         } else if view == lineWidthSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
             CPDFMeasureDefaultInfo.update_default_measure_LineWidth(annotationType: self.annotationType, value)
             
         } else if view == lineDashSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
             CPDFMeasureDefaultInfo.update_default_measure_DashPattern(annotationType: self.annotationType, value)
             

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Pen/KMPenController.swift

@@ -100,7 +100,7 @@ class KMPenController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -119,7 +119,7 @@ class KMPenController: NSViewController {
                                                               regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -181,7 +181,7 @@ class KMPenController: NSViewController {
             }
             lineTypeSelector.reloadData()
             
-            let percent = (border.lineWidth - 1)/17
+            let percent = border.lineWidth/18
             lineWidthSlider.properties.percent = percent
             lineWidthSlider.reloadData()
             
@@ -199,7 +199,7 @@ class KMPenController: NSViewController {
                         break
                     }
                 }
-                let percent: CGFloat = (CGFloat(dash) - 1)/17
+                let percent: CGFloat = CGFloat(dash)/18
                 lineDashSlider.properties.percent = percent
                 lineDashSlider.reloadData()
                 
@@ -229,7 +229,7 @@ class KMPenController: NSViewController {
             }
             lineTypeSelector.reloadData()
             
-            let percent = (border.lineWidth - 1)/17
+            let percent = border.lineWidth/18
             lineWidthSlider.properties.percent = percent
             lineWidthSlider.reloadData()
             
@@ -247,7 +247,7 @@ class KMPenController: NSViewController {
                         break
                     }
                 }
-                let percent: CGFloat = (CGFloat(dash) - 1)/17
+                let percent: CGFloat = CGFloat(dash)/18
                 lineDashSlider.properties.percent = percent
                 lineDashSlider.reloadData()
                 
@@ -324,7 +324,7 @@ class KMPenController: NSViewController {
                 } else {
                     let border: CPDFBorder = annotation.border ?? CPDFBorder()
                     
-                    let percent = (border.lineWidth - 1)/17
+                    let percent = border.lineWidth/18
                     lineWidthSlider.properties.percent = percent
                     lineWidthSlider.reloadData()
                     
@@ -349,7 +349,7 @@ class KMPenController: NSViewController {
                         }
                     }
                     
-                    let percent = (dashA - 1)/17
+                    let percent = dashA/18
                     lineDashSlider.properties.percent = percent
                     lineDashSlider.reloadData()
                     
@@ -393,12 +393,12 @@ extension KMPenController: ComponentSliderDelegate {
             CPDFInkAnnotation.updateDefault_Opacity(opacity)
             
         } else if view == lineWidthSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
             CPDFInkAnnotation.updateDefault_LineWidth(value)
             
         } else if view == lineDashSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
             CPDFInkAnnotation.updateDefault_DashPattern(value)
             
@@ -420,8 +420,8 @@ extension KMPenController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
                 CPDFInkAnnotation.updateDefault_LineWidth(value)
@@ -430,8 +430,8 @@ extension KMPenController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
                 CPDFInkAnnotation.updateDefault_DashPattern(value)
@@ -454,8 +454,8 @@ extension KMPenController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
                 CPDFInkAnnotation.updateDefault_LineWidth(value)
@@ -464,8 +464,8 @@ extension KMPenController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
                 CPDFInkAnnotation.updateDefault_DashPattern(value)

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Rectangle/KMRectangleController.swift

@@ -128,7 +128,7 @@ class KMRectangleController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -147,7 +147,7 @@ class KMRectangleController: NSViewController {
                                                               regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -239,7 +239,7 @@ class KMRectangleController: NSViewController {
                     solidProperty.state = .pressed
                 }
                 
-                let percent = (border.lineWidth - 1)/17
+                let percent = border.lineWidth/18
                 lineWidthSlider.properties.percent = percent
                 lineWidthSlider.reloadData()
                 
@@ -257,7 +257,7 @@ class KMRectangleController: NSViewController {
                             break
                         }
                     }
-                    let percent: CGFloat = (CGFloat(dash) - 1)/17
+                    let percent: CGFloat = CGFloat(dash)/18
                     lineDashSlider.properties.percent = percent
                     lineDashSlider.reloadData()
                     
@@ -284,7 +284,7 @@ class KMRectangleController: NSViewController {
                     solidProperty.state = .pressed
                 }
                 
-                let percent = (border.lineWidth - 1)/17
+                let percent = border.lineWidth/18
                 lineWidthSlider.properties.percent = percent
                 lineWidthSlider.reloadData()
                 
@@ -302,7 +302,7 @@ class KMRectangleController: NSViewController {
                             break
                         }
                     }
-                    let percent: CGFloat = (CGFloat(dash) - 1)/17
+                    let percent: CGFloat = CGFloat(dash)/18
                     lineDashSlider.properties.percent = percent
                     lineDashSlider.reloadData()
                     
@@ -333,7 +333,7 @@ class KMRectangleController: NSViewController {
                 solidProperty.state = .pressed
             }
             
-            let percent = (border.lineWidth - 1)/17
+            let percent = border.lineWidth/18
             lineWidthSlider.properties.percent = percent
             
             lineWidthSelect.properties.text = String(format: "%.0f%@", border.lineWidth, " pt")
@@ -349,7 +349,7 @@ class KMRectangleController: NSViewController {
                         break
                     }
                 }
-                let percent: CGFloat = (CGFloat(dash) - 1)/17
+                let percent: CGFloat = CGFloat(dash)/18
                 lineDashSlider.properties.percent = percent
                 
                 lineDashSelect.properties.text = String(format: "%.0f%@", CGFloat(dash), " pt")
@@ -436,7 +436,7 @@ class KMRectangleController: NSViewController {
                 } else {
                     let border: CPDFBorder = annotation.border ?? CPDFBorder()
                     
-                    let percent = (border.lineWidth - 1)/17
+                    let percent = border.lineWidth/18
                     lineWidthSlider.properties.percent = percent
                     lineWidthSlider.reloadData()
                     
@@ -461,7 +461,7 @@ class KMRectangleController: NSViewController {
                         }
                     }
                     
-                    let percent = (dashA - 1)/17
+                    let percent = dashA / 18
                     lineDashSlider.properties.percent = percent
                     lineDashSlider.reloadData()
                     
@@ -533,7 +533,7 @@ extension KMRectangleController: ComponentSliderDelegate {
             }
             
         } else if view == lineWidthSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
             
             if circleAnnotations.count > 0  || viewManager?.subToolMode == .Circle {
@@ -544,7 +544,7 @@ extension KMRectangleController: ComponentSliderDelegate {
             }
             
         } else if view == lineDashSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
             
             if circleAnnotations.count > 0  || viewManager?.subToolMode == .Circle{
@@ -577,8 +577,8 @@ extension KMRectangleController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
                 
@@ -593,8 +593,8 @@ extension KMRectangleController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
                 
@@ -630,8 +630,8 @@ extension KMRectangleController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
                 
@@ -646,8 +646,8 @@ extension KMRectangleController: ComponentSelectDelegate {
                 var value = result.stringToCGFloat()
                 if value > 18 {
                     value = 18
-                } else if value < 1 {
-                    value = 1
+                } else if value < 0 {
+                    value = 0
                 }
                 CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
                 

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/TextBox/KMTextBoxController.swift

@@ -160,7 +160,7 @@ class KMTextBoxController: NSViewController {
                                                                regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -179,7 +179,7 @@ class KMTextBoxController: NSViewController {
                                                               regexString: "0123456789 pt")
         if true {
             var opacityItems: [ComponentMenuitemProperty] = []
-            for string in ["1 pt", "3 pt", "6 pt", "9 pt", "12 pt", "15 pt", "18 pt"] {
+            for string in ["1 pt", "2 pt", "4 pt", "6 pt", "8 pt", "10 pt"] {
                 let item = ComponentMenuitemProperty(type: .normal, text: string)
                 opacityItems.append(item)
             }
@@ -493,7 +493,7 @@ class KMTextBoxController: NSViewController {
         }
          
         if let value = lineWidth {
-            let percent = (value - 1)/17
+            let percent = value/18
             lineWidthSlider.properties.percent = percent
             lineWidthSlider.reloadData()
             
@@ -508,7 +508,7 @@ class KMTextBoxController: NSViewController {
         }
         
         if let value = dashPattern {
-            let percent = (value - 1)/17
+            let percent = value/18
             lineDashSlider.properties.percent = percent
             lineDashSlider.reloadData()
             
@@ -558,11 +558,11 @@ extension KMTextBoxController: ComponentSliderDelegate {
             CPDFFreeTextAnnotation.update_DefaultOpacity_Info(opacity)
             
         } else if view == lineWidthSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newLineWidth: value, withPDFView: pdfView)
             CPDFFreeTextAnnotation.update_DefaultLineWidth_Info(value)
         } else if view == lineDashSlider {
-            let value = view.properties.percent * 17 + 1
+            let value = view.properties.percent * 18
             CPDFAnnotation.updateAnnotations(annotations, newDashPattern: value, withPDFView: pdfView)
             CPDFFreeTextAnnotation.update_DefaultDashPattern_Info(value)
         }

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift

@@ -702,7 +702,11 @@ class KMPDFToolbarController: NSViewController {
             sender.properties.state = viewManager.isPageEditMode ? .pressed : .normal
             sender.reloadData()
             
-            viewManager.toolMode = .None
+            if viewManager.toolMode != .None {
+                cancelSelectedSecondToolbarItems(viewManager.toolMode)
+                
+                viewManager.toolMode = .None
+            }
         } else if sender.properties == toolbarManager.rightViewProperty {
             //MARK: -属性栏
             viewManager.showRightSide = !viewManager.showRightSide