【fix】【测量】属性栏按钮显示不全等UI细节问题

PDF Office/PDF Master/Class/PDFTools/Measure/Side/KMMeasureSideVC.swift

@@ -464,6 +464,7 @@ class KMMeasureSideVC: NSViewController {
             setViewColor(lineWidthComboBox, darkColor, borderColor)
             setViewColor(opacityComboBox, darkColor, borderColor)
             setViewColor(opacityComboBox, darkColor, borderColor)
+            setViewColor(lineStyle_DashComBox, darkColor, borderColor)
             self.typeBoxView.layer?.borderColor = NSColor(hex: "#424345").cgColor
         } else {
             let lightColor = NSColor.white.cgColor
@@ -475,6 +476,7 @@ class KMMeasureSideVC: NSViewController {
             setViewColor(lineWidthComboBox, lightColor, borderColor)
             setViewColor(opacityComboBox, lightColor, borderColor)
             setViewColor(opacityComboBox, lightColor, borderColor)
+            setViewColor(lineStyle_DashComBox, lightColor, borderColor)
             
             self.typeBoxView.layer?.borderColor = NSColor(hex: "#E2E3E6").cgColor
         }
@@ -499,7 +501,7 @@ class KMMeasureSideVC: NSViewController {
 
         let image1 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 6.0, y: 6.0))
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()
@@ -509,7 +511,7 @@ class KMMeasureSideVC: NSViewController {
         
         let image2 = NSImage.image(with: size) { dstRect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 12.0, y: 6.0))
             path.appendRect(NSRect(x: 6.0, y: 3.0, width: 6.0, height: 6.0))
             path.lineWidth = 2.0
@@ -520,7 +522,7 @@ class KMMeasureSideVC: NSViewController {
         
         let image3 = NSImage.image(with: size) { dstRect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 12.0, y: 6.0))
             path.appendOval(in: NSRect(x: 6.0, y: 3.0, width: 6.0, height: 6.0))
             path.lineWidth = 2.0
@@ -531,7 +533,7 @@ class KMMeasureSideVC: NSViewController {
         
         let image4 = NSImage.image(with: size) { dstRect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 14.0, y: 6.0))
             path.move(to: NSPoint(x: 14.0, y: 6.0))
             path.line(to: NSPoint(x: 10.0, y: 10.0))
@@ -546,7 +548,7 @@ class KMMeasureSideVC: NSViewController {
         
         let image5 = NSImage.image(with: size) { dstRect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 6.0, y: 6.0))
             path.move(to: NSPoint(x: 15.0, y: 3.0))
             path.line(to: NSPoint(x: 6.0, y: 6.0))
@@ -559,7 +561,7 @@ class KMMeasureSideVC: NSViewController {
         
         let image6 = NSImage.image(with: size) { dstRect in
             let path = NSBezierPath()
-            path.move(to: NSPoint(x: 93.0, y: 6.0))
+            path.move(to: NSPoint(x: 93.0-4, y: 6.0))
             path.line(to: NSPoint(x: 6.0, y: 6.0))
             path.move(to: NSPoint(x: 15.0, y: 3.0))
             path.line(to: NSPoint(x: 6.0, y: 6.0))
@@ -580,7 +582,7 @@ class KMMeasureSideVC: NSViewController {
         let image1 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 93.0, y: 6.0))
+            path.line(to: NSPoint(x: 93.0-4, y: 6.0))
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()
             path.stroke()
@@ -590,8 +592,8 @@ class KMMeasureSideVC: NSViewController {
         let image2 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 87.0, y: 6.0))
-            path.appendRect(NSRect(x: 87.0, y: 3.0, width: 6.0, height: 6.0))
+            path.line(to: NSPoint(x: 87.0-4, y: 6.0))
+            path.appendRect(NSRect(x: 87.0-4, y: 3.0, width: 6.0, height: 6.0))
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()
             path.stroke()
@@ -601,8 +603,8 @@ class KMMeasureSideVC: NSViewController {
         let image3 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 87.0, y: 6.0))
-            path.appendOval(in: NSRect(x: 87.0, y: 3.0, width: 6.0, height: 6.0))
+            path.line(to: NSPoint(x: 87.0-4, y: 6.0))
+            path.appendOval(in: NSRect(x: 87.0-4, y: 3.0, width: 6.0, height: 6.0))
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()
             path.stroke()
@@ -612,11 +614,11 @@ class KMMeasureSideVC: NSViewController {
         let image4 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 87.0, y: 6.0))
-            path.move(to: NSPoint(x: 87.0, y: 6.0))
-            path.line(to: NSPoint(x: 91.0, y: 10.0))
-            path.line(to: NSPoint(x: 95.0, y: 6.0))
-            path.line(to: NSPoint(x: 91.0, y: 2.0))
+            path.line(to: NSPoint(x: 87.0-4, y: 6.0))
+            path.move(to: NSPoint(x: 87.0-4, y: 6.0))
+            path.line(to: NSPoint(x: 91.0-4, y: 10.0))
+            path.line(to: NSPoint(x: 95.0-4, y: 6.0))
+            path.line(to: NSPoint(x: 91.0-4, y: 2.0))
             path.close()
             NSColor.labelColor.setStroke()
             path.lineWidth = 2.0
@@ -627,10 +629,10 @@ class KMMeasureSideVC: NSViewController {
         let image5 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 93.0, y: 6.0))
-            path.move(to: NSPoint(x: 84.0, y: 3.0))
-            path.line(to: NSPoint(x: 93.0, y: 6.0))
-            path.line(to: NSPoint(x: 84.0, y: 9.0))
+            path.line(to: NSPoint(x: 93.0-4, y: 6.0))
+            path.move(to: NSPoint(x: 84.0-4, y: 3.0))
+            path.line(to: NSPoint(x: 93.0-4, y: 6.0))
+            path.line(to: NSPoint(x: 84.0-4, y: 9.0))
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()
             path.stroke()
@@ -640,10 +642,10 @@ class KMMeasureSideVC: NSViewController {
         let image6 = NSImage.image(with: size) { rect in
             let path = NSBezierPath()
             path.move(to: NSPoint(x: 6.0, y: 6.0))
-            path.line(to: NSPoint(x: 93.0, y: 6.0))
-            path.move(to: NSPoint(x: 84.0, y: 3.0))
-            path.line(to: NSPoint(x: 93.0, y: 6.0))
-            path.line(to: NSPoint(x: 84.0, y: 9.0))
+            path.line(to: NSPoint(x: 93.0-4, y: 6.0))
+            path.move(to: NSPoint(x: 84.0-4, y: 3.0))
+            path.line(to: NSPoint(x: 93.0-4, y: 6.0))
+            path.line(to: NSPoint(x: 84.0-4, y: 9.0))
             path.close()
             path.lineWidth = 2.0
             NSColor.labelColor.setStroke()