Browse Source

【PDFull】暗黑模式高亮图片处理完善

niehaoyu 6 months ago
parent
commit
d938773785
27 changed files with 1306 additions and 9 deletions
  1. 3 3
      PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_M.colorset/Contents.json
  2. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/Contents.json
  3. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/ic_subtoolbar_mytools_highlight.pdf
  4. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/ic_subtoolbar_mytools_highlight_nor 1.pdf
  5. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/Contents.json
  6. 82 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/ic_subtoolbar_mytools_strikeout.pdf
  7. 82 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/ic_subtoolbar_mytools_strikeout_sel.pdf
  8. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/Contents.json
  9. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/ic_subtoolbar_mytools_underline.pdf
  10. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/ic_subtoolbar_mytools_underline_sel.pdf
  11. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/Contents.json
  12. 59 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/Status=sel.pdf
  13. 60 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/ic.pdf
  14. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/Contents.json
  15. 61 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/Status=sel.pdf
  16. 62 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/ic.pdf
  17. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/Contents.json
  18. 59 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/Status=sel.pdf
  19. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/ic_subtoolbar_display_tailor.pdf
  20. 22 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/Contents.json
  21. 95 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/Status=sel.pdf
  22. 95 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/view.pdf
  23. 46 1
      PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.swift
  24. 4 1
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.swift
  25. 12 0
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift
  26. 12 0
      PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift
  27. 68 4
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 3 - 3
PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_M.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.859",
-          "green" : "0.498",
-          "red" : "0.306"
+          "blue" : "255",
+          "green" : "100",
+          "red" : "112"
         }
       },
       "idiom" : "universal"

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_subtoolbar_mytools_highlight_nor 1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_subtoolbar_mytools_highlight.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/ic_subtoolbar_mytools_highlight.pdf

@@ -0,0 +1,88 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 3.500000 cm
+1.000000 1.000000 1.000000 scn
+12.607775 1.000021 m
+7.696358 13.278564 l
+6.303642 13.278564 l
+1.392225 1.000021 l
+0.000000 1.000021 l
+0.000000 0.000021 l
+4.000000 0.000021 l
+4.000000 1.000021 l
+3.007762 1.000021 l
+4.107717 3.750021 l
+9.892282 3.750021 l
+10.992238 1.000021 l
+10.000000 1.000021 l
+10.000000 0.000021 l
+14.000000 0.000021 l
+14.000000 1.000021 l
+12.607775 1.000021 l
+h
+9.492299 4.750021 m
+7.000000 10.981022 l
+4.507701 4.750021 l
+9.492299 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIconHighlight.imageset/ic_subtoolbar_mytools_highlight_nor 1.pdf

@@ -0,0 +1,88 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 3.500000 cm
+0.439216 0.392157 1.000000 scn
+12.607775 1.000021 m
+7.696358 13.278564 l
+6.303642 13.278564 l
+1.392225 1.000021 l
+0.000000 1.000021 l
+0.000000 0.000021 l
+4.000000 0.000021 l
+4.000000 1.000021 l
+3.007762 1.000021 l
+4.107717 3.750021 l
+9.892282 3.750021 l
+10.992238 1.000021 l
+10.000000 1.000021 l
+10.000000 0.000021 l
+14.000000 0.000021 l
+14.000000 1.000021 l
+12.607775 1.000021 l
+h
+9.492299 4.750021 m
+7.000000 10.981022 l
+4.507701 4.750021 l
+9.492299 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_subtoolbar_mytools_strikeout.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_subtoolbar_mytools_strikeout_sel.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 82 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/ic_subtoolbar_mytools_strikeout.pdf

@@ -0,0 +1,82 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 3.607178 cm
+0.439216 0.392157 1.000000 scn
+11.849380 0.999987 m
+10.714286 0.999987 l
+10.714286 -0.000013 l
+15.000000 -0.000013 l
+15.000000 0.999987 l
+13.464917 0.999987 l
+8.196358 14.171387 l
+6.803642 14.171387 l
+1.535083 0.999987 l
+0.000000 0.999987 l
+0.000000 -0.000013 l
+4.285714 -0.000013 l
+4.285714 0.999987 l
+3.150620 0.999987 l
+7.500000 11.873844 l
+11.849380 0.999987 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  462
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000552 00000 n
+0000000574 00000 n
+0000000747 00000 n
+0000000821 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+880
+%%EOF

+ 82 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeoutHighlight.imageset/ic_subtoolbar_mytools_strikeout_sel.pdf

@@ -0,0 +1,82 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 3.607147 cm
+1.000000 1.000000 1.000000 scn
+11.849380 0.999987 m
+10.714286 0.999987 l
+10.714286 -0.000013 l
+15.000000 -0.000013 l
+15.000000 0.999987 l
+13.464917 0.999987 l
+8.196358 14.171387 l
+6.803642 14.171387 l
+1.535083 0.999987 l
+0.000000 0.999987 l
+0.000000 -0.000013 l
+4.285714 -0.000013 l
+4.285714 0.999987 l
+3.150620 0.999987 l
+7.500000 11.873844 l
+11.849380 0.999987 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  462
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000552 00000 n
+0000000574 00000 n
+0000000747 00000 n
+0000000821 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+880
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_subtoolbar_mytools_underline.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_subtoolbar_mytools_underline_sel.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/ic_subtoolbar_mytools_underline.pdf

@@ -0,0 +1,88 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 5.000000 cm
+0.439216 0.392157 1.000000 scn
+10.000000 1.000021 m
+10.992238 1.000021 l
+9.892282 3.750021 l
+4.107718 3.750021 l
+3.007762 1.000021 l
+4.000000 1.000021 l
+4.000000 0.000021 l
+0.000000 0.000021 l
+0.000000 1.000021 l
+1.392225 1.000021 l
+6.303642 13.278564 l
+7.696358 13.278564 l
+12.607775 1.000021 l
+14.000000 1.000021 l
+14.000000 0.000021 l
+10.000000 0.000021 l
+10.000000 1.000021 l
+h
+4.507701 4.750021 m
+9.492299 4.750021 l
+7.000000 10.981022 l
+4.507701 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderlineHighlight.imageset/ic_subtoolbar_mytools_underline_sel.pdf

@@ -0,0 +1,88 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 5.000000 cm
+1.000000 1.000000 1.000000 scn
+10.000000 0.999990 m
+10.992238 0.999990 l
+9.892282 3.749990 l
+4.107718 3.749990 l
+3.007762 0.999990 l
+4.000000 0.999990 l
+4.000000 -0.000010 l
+0.000000 -0.000010 l
+0.000000 0.999990 l
+1.392225 0.999990 l
+6.303642 13.278534 l
+7.696358 13.278534 l
+12.607775 0.999990 l
+14.000000 0.999990 l
+14.000000 -0.000010 l
+10.000000 -0.000010 l
+10.000000 0.999990 l
+h
+4.507701 4.749990 m
+9.492299 4.749990 l
+7.000000 10.980991 l
+4.507701 4.749990 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  564
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000654 00000 n
+0000000676 00000 n
+0000000849 00000 n
+0000000923 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+982
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Status=sel.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 59 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/Status=sel.pdf

@@ -0,0 +1,59 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+xm’ÁNÃ0Dïû9#áz'¶¯€Äø«¨HI%T‰ïÇIº³‹p/�<{gÆqN/矯z~}ž?è¤OõFßÄÎï¿Á‹x„2kajÿI‡¨«Nþ·z%žä‰g·ùa¥(Rábà(j!mуq‘õ.´ã¦SŸšRÒ=dG;v­´y(•¡EBXf¦g‘}ˆ~m\;õ©1¸P‘ëbÄ®”\ô!'í­•Ø�$W_	,ºr8Àj”T$‚TÚ:®€EÁK‘‰Tˆfê¦ý‘ª¨þ9>¾ŒvìÂœSŽ†6Ï}£²K÷E [priäÀó–x·ÃWŒX�JÙ…c?X’pX�˜D0ƒ“ÖG ¢íøŸt¥7ú@NÄ/
+endstream
+endobj
+
+3 0 obj
+  282
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000400 00000 n
+0000000422 00000 n
+0000000595 00000 n
+0000000669 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+728
+%%EOF

+ 60 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight.imageset/ic.pdf

@@ -0,0 +1,60 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+xm’ÁjÄ0DïúŠœõZŽÇ׶ÐsÛO0[¶�,”…~•d5ÒB|ñäÉ�cŸÞÎ?íüùþÒ½~ÑɾÚ�~‰CÜFU<C¹Zd^IÙE[(†Ü×Ä£T×y(R•’Œî֮ă~ñ¶M±[(«48;Ø«šÅ^fÇb&®Z?„~»ËtL]¨ÙNºb!žT£ºI JÏÜîQå1D>Ùn™Ž©3¸PÕëb´]¨„S©*ä¯Õ’Ø‘¢Wß,‡º;Àª×®èÒhÍ´»rV/C®¥A$37Ë�®†ÚÃññ2äþ8¤q*SvT<·…±›B¹�|À!”ž×ÇovxÅhÒh
+i_V´9¬@\G0ƒ“ÅGCCëñ¿ŸèJôõHÄa
+endstream
+endobj
+
+3 0 obj
+  294
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000412 00000 n
+0000000434 00000 n
+0000000607 00000 n
+0000000681 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+740
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Status=sel.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 61 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/Status=sel.pdf

@@ -0,0 +1,61 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+xu“ÁŽ1DïùŠœ‘ðÆvœØW@â|BkÑ"-+¡•ø~*=§l_&óÚ®*;3Ÿÿ8¿~þP?~+ûÛñZ~¦v>µÝïóty'†Ïu˜ÍC´?w翇×ã¥0ÓÙ“‚bMIÙÉ\Ø´>%=¡RçцÞºÞ‚F<À:Øêî±í³ÝŸËSáÛ7p6šÆ«©’
+¹Êͪ“š
å:h¤ì]õž±r.˜ÍW¸m¶ù*îA'F¦„¨mÒ]“Úh>1‡kGLìfžeX¾7¶hõ(*é˜Á$Ò‚­v’Æ¡}]Šð`SŸ:.(£@/!µ®Z·cVXšÓó	wṺ74½™ÆŠ“³ ÖÃœöÈðñ³ám²K ¬‰¯+K8	ñ°~#�‹Y[Ô¡—ÌÓ)œÕŠ"#ûºL†Kr·¥'Šâ¥‡"<Õ×¢7l"QF�^B\º*OÁzR?
+1çî—0`nx‹îM•Fk³óŠ“³¬õtóÍýÍd—@Oåû»òR¾”?GÚÊv
+endstream
+endobj
+
+3 0 obj
+  415
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000533 00000 n
+0000000555 00000 n
+0000000728 00000 n
+0000000802 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+861
+%%EOF

+ 62 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTTSHighlight.imageset/ic.pdf

@@ -0,0 +1,62 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+xm“Ëj1…÷~
+¯Ut±eyÛºnûCJ
+I òü9žðËCˆ7ãùF::’=w?î_ÿ÷¿~«ßÿ”»ýv¼”ÿEˆÏUù¶ùš»Ë7íx®Íà˜ÑêñT˜šM\Ï>vüËñ\Dè̹	JõéB%¨‡²I},F1í„FMúlxfa};‰ƒ)ØÊnØ®³«?–‡"çV•N£óŠ†«¤Jaò^ª‘õîðçä){SýŒ¡æ\>Ìä+ÜevñÓÔ¼ILÒybxJˆXV�Qe;‡OØô0ƒMÌBX~ K�z”
�ÌǘŒ2â¤ÊðR)Kˆ®#@Úé.í‚Ò
+ôŠ7Ó�¾RNÐk0$g]ô§Òxö•½©Ón¸2°“½ Wª£Ònub̸SÉ.†028¼bŒ,á€%åqŠÛh›˜¢¹2ª¤ŸFcðÅ
ႺN�uሾôÔ¢Ÿzª±þ	
L"QZ�^Bº™8c<)‡K¡=Xýb,º†ÛÊÞÔÈ™]沓½¬ñ´îøwËÈ—9ƒ¡™ìbè¡üýRžË¯òÁÆÊë
+endstream
+endobj
+
+3 0 obj
+  424
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000542 00000 n
+0000000564 00000 n
+0000000737 00000 n
+0000000811 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+870
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_subtoolbar_display_tailor.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Status=sel.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 59 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/Status=sel.pdf

@@ -0,0 +1,59 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+xm�ËNÃ0E÷þŠ¬‘˜züÈØ[@b
|BTRZ	UâûçÚQSuqrÆsÇãÓËù÷{9¿¿>MÏæÔ¿–›ù1L¶þ&»Á#µ{X.½ónËÕ’¨¬6mú2HÐj:w-@%²¥'‰‡;ªÄ�C	X
0¸Þ±KÜbl?”Ølžn�_]GJlçyÿÊHÒ�qÊÞç½eÊ1äXÏZŽ3»bÁ[�ÿmëkY¡&Àbìjp™�Ë!ÄÔ¥äõ¯ˆbq­!eOÖ¯¬Oõ¥’÷’uSžœ^�gâ,1×ëƒ{]-úz–Zp¯×yVWÖ«eb7GÊ8¦Ù²ÏzØRV´M#Ky­V_
Ú´\“Ên©eX"—ÅNBÂÎ3ë,!“D™fr9ÙšÙPô\-×ZìÔBʪ
‡¼2åóÁ\Í›ùDŽÌ-
+endstream
+endobj
+
+3 0 obj
+  330
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000448 00000 n
+0000000470 00000 n
+0000000643 00000 n
+0000000717 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+776
+%%EOF

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayTailorHighlight.imageset/ic_subtoolbar_display_tailor.pdf


+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "view.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Status=sel.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 95 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/Status=sel.pdf

@@ -0,0 +1,95 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.250000 2.250000 cm
+1.000000 1.000000 1.000000 scn
+19.500000 15.500000 m
+0.000000 15.500000 l
+0.000000 0.000000 l
+19.500000 0.000000 l
+19.500000 15.500000 l
+h
+18.000000 14.000000 m
+18.000000 1.500000 l
+10.500000 1.500000 l
+10.500000 14.000000 l
+18.000000 14.000000 l
+h
+9.000000 14.000000 m
+9.000000 1.500000 l
+1.500000 1.500000 l
+1.500000 14.000000 l
+9.000000 14.000000 l
+h
+5.750000 12.500000 m
+5.750000 11.000000 l
+2.750000 11.000000 l
+2.750000 12.500000 l
+5.750000 12.500000 l
+h
+6.750000 8.000000 m
+6.750000 9.500000 l
+2.750000 9.500000 l
+2.750000 8.000000 l
+6.750000 8.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  658
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000748 00000 n
+0000000770 00000 n
+0000000943 00000 n
+0000001017 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1076
+%%EOF

+ 95 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_subtoolbar/KMImageNameUXIconSubtoolbarDisplayViewHighlight.imageset/view.pdf

@@ -0,0 +1,95 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.250000 2.250000 cm
+0.439216 0.392157 1.000000 scn
+19.500000 15.500000 m
+0.000000 15.500000 l
+0.000000 0.000000 l
+19.500000 0.000000 l
+19.500000 15.500000 l
+h
+18.000000 14.000000 m
+18.000000 1.500000 l
+10.500000 1.500000 l
+10.500000 14.000000 l
+18.000000 14.000000 l
+h
+9.000000 14.000000 m
+9.000000 1.500000 l
+1.500000 1.500000 l
+1.500000 14.000000 l
+9.000000 14.000000 l
+h
+5.750000 12.500000 m
+5.750000 11.000000 l
+2.750000 11.000000 l
+2.750000 12.500000 l
+5.750000 12.500000 l
+h
+6.750000 8.000000 m
+6.750000 9.500000 l
+2.750000 9.500000 l
+2.750000 8.000000 l
+6.750000 8.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  658
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000748 00000 n
+0000000770 00000 n
+0000000943 00000 n
+0000001017 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1076
+%%EOF

+ 46 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.swift

@@ -26,7 +26,9 @@ let SKNNoteString = "SKNNoteString"
 let SKNCircleString = "SKNCircleString"
 let SKNSquareString = "SKNSquareString"
 let SKNHighlightString = "SKNHighlightString"
+let SKNHighlightStringHighlight = "SKNHighlightStringHighlight"
 let SKNUnderlineString = "SKNUnderlineString"
+let SKNUnderlineStringHighlight = "SKNUnderlineStringHighlight"
 let SKNStrikeOutString = "SKNStrikeOutString"
 let SKNStrikeOutStringHighlight = "SKNStrikeOutStringHighlight"
 let SKNLine_NoneString = "SKNLine_NoneString"
@@ -65,8 +67,11 @@ class KMNoteTypeImageView: NSImageView {
         var image: NSImage?
         
         var strikePath = "KMImageNameAnnotationStrikeout"
+        var strikePathHighlight = "KMImageNameAnnotationStrikeoutHighlight"
         var highlight = "KMImageNameStikeoutIcon"
+        var highlightHighlight = "KMImageNameStikeoutIconHighlight"
         var underline = "KMImageNameAnnotationUnderline"
+        var underlineHighlight = "KMImageNameAnnotationUnderlineHighlight"
         var inkImagePath = Bundle.main.path(forResource: "KMImageNameAnnotationFreehand", ofType: "pdf")
         
         if #available(macOS 10.14, *) {
@@ -136,6 +141,28 @@ class KMNoteTypeImageView: NSImageView {
                 }
                 image?.unlockFocus()
             }
+        } else if type == SKNHighlightStringHighlight {
+            if let baseImage = NSImage(named: highlightHighlight) {
+                var size = NSMakeSize(20, 20)
+                image = NSImage(size: size)
+                image?.lockFocus()
+                if let context = NSGraphicsContext.current?.cgContext {
+                    let newColor = color.usingColorSpaceName(NSColorSpaceName.calibratedRGB)
+                    let newUnderlineColor = NSColor(red: newColor!.redComponent, green: newColor!.greenComponent, blue: newColor!.blueComponent, alpha: newColor?.alphaComponent ?? 0.7)
+                    newUnderlineColor.setFill()
+                    context.setStrokeColor(NSColor.clear.cgColor)
+                    let fw = image!.size.width
+                    let fh = image!.size.height
+                    context.move(to: CGPoint(x: 0, y: fh - 4))
+                    context.addArc(tangent1End: CGPoint(x: 0, y: 0), tangent2End: CGPoint(x: 4, y: 0), radius: 2)
+                    context.addArc(tangent1End: CGPoint(x: fw, y: 0), tangent2End: CGPoint(x: fw, y: 4), radius: 2)
+                    context.addArc(tangent1End: CGPoint(x: fw, y: fh), tangent2End: CGPoint(x: fw - 4, y: fh), radius: 2)
+                    context.addArc(tangent1End: CGPoint(x: 0, y: fh), tangent2End: CGPoint(x: 0, y: fh - 4), radius: 2)
+                    context.drawPath(using: .fillStroke)
+                    baseImage.draw(in: CGRect(x: 0, y: 0, width: image!.size.width, height: image!.size.height))
+                }
+                image?.unlockFocus()
+            }
         } else if type == SKNUnderlineString {
             if let baseImage = NSImage(named: underline) {
                 var size = NSMakeSize(20, 20)
@@ -154,6 +181,24 @@ class KMNoteTypeImageView: NSImageView {
                 }
                 image?.unlockFocus()
             }
+        } else if type == SKNUnderlineStringHighlight {
+            if let baseImage = NSImage(named: underlineHighlight) {
+                var size = NSMakeSize(20, 20)
+                image = NSImage(size: size)
+                image?.lockFocus()
+                if let context = NSGraphicsContext.current?.cgContext {
+                    context.beginPath()
+                    context.move(to: CGPoint(x: 0, y: 1))
+                    context.addLine(to: CGPoint(x: image!.size.width, y: 1))
+                    let newColor = color.usingColorSpaceName(NSColorSpaceName.calibratedRGB)
+                    let newUnderlineColor = NSColor(red: newColor!.redComponent, green: newColor!.greenComponent, blue: newColor!.blueComponent, alpha: 1)
+                    newUnderlineColor.setStroke()
+                    context.setLineWidth(2)
+                    context.strokePath()
+                    baseImage.draw(in: CGRect(x: 0, y: 0, width: image!.size.width, height: image!.size.height))
+                }
+                image?.unlockFocus()
+            }
         } else if type == SKNStrikeOutString {
             if let strikeImage = NSImage(named: strikePath) {
                 var size = NSMakeSize(20, 20)
@@ -173,7 +218,7 @@ class KMNoteTypeImageView: NSImageView {
                 image?.unlockFocus()
             }
         } else if type == SKNStrikeOutStringHighlight {
-            if let strikeImage = NSImage(named: strikePath) {
+            if let strikeImage = NSImage(named: strikePathHighlight) {
                 var size = NSMakeSize(20, 20)
                 image = NSImage(size: size)
                 image?.lockFocus()

+ 4 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.swift

@@ -224,7 +224,7 @@ class KMPageDisplayPropertiesButton: NSButton {
         themeLabel.stringValue = NSLocalizedString("Themes", comment: "")
         themeLabel.textColor = KMAppearance.Layout.h0Color()
 
-        let buttonArr: [NSButton] = [singlePageButton, twoPagesButton, coverPageButton, readModeButton, continuousScrollButton, singleScreenButton, verticalScreenButton, horizontalScreenButton]
+        let buttonArr: [NSButton] = [singlePageButton, twoPagesButton, coverPageButton, readModeButton, continuousScrollButton, singleScreenButton, verticalScreenButton, horizontalScreenButton, pageBreaksButton]
 
         for button in buttonArr {
             if let attrTitle = button.attributedTitle.mutableCopy() as? NSMutableAttributedString {
@@ -235,6 +235,9 @@ class KMPageDisplayPropertiesButton: NSButton {
                 button.attributedTitle = attrTitle
             }
         }
+        
+        continuousScrollButton.contentTintColor = KMAppearance.Layout.mColor()
+        pageBreaksButton.contentTintColor = KMAppearance.Layout.mColor()
 
         var data: Data? = nil
         if let themesData = UserDefaults.standard.object(forKey: "kKMPDFViewModeThemesArray") as? Data {

+ 12 - 0
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -1589,6 +1589,8 @@ extension KMToolbarViewController {
             let imageV = KMNoteTypeImageView()
             let color = UserDefaults.standard.PDFListViewColor(forKey: CHighlightNoteColorKey) ?? .red
             item?.image = imageV.noteTypeImage(withType: SKNHighlightString, color: color)
+            item?.selectedImage = imageV.noteTypeImage(withType: SKNHighlightStringHighlight, color: color)
+            item?.alternateImage = imageV.noteTypeImage(withType: SKNHighlightStringHighlight, color: color)
             item?.target = self
             item?.btnTag = CAnnotationType.highlight.rawValue
             item?.isShowCustomToolTip = true
@@ -1603,6 +1605,8 @@ extension KMToolbarViewController {
             let imageV = KMNoteTypeImageView()
             let color = UserDefaults.standard.PDFListViewColor(forKey: CUnderlineNoteColorKey) ?? .red
             item?.image = imageV.noteTypeImage(withType: SKNUnderlineString, color: color)
+            item?.selectedImage = imageV.noteTypeImage(withType: SKNUnderlineStringHighlight, color: color)
+            item?.alternateImage = imageV.noteTypeImage(withType: SKNUnderlineStringHighlight, color: color)
             item?.target = self
             item?.btnTag = CAnnotationType.underline.rawValue
             item?.isShowCustomToolTip = true
@@ -2215,6 +2219,8 @@ extension KMToolbarViewController {
         let identifier = item?.itemIdentifier
         if identifier == KMToolbarViewSettingIdentifier {
             item?.image = NSImage(named: KMImageNameUXIconSubtoolbarDisplayView)
+            item?.selectedImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayViewHighlight")
+            item?.alternateImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayViewHighlight")
             item?.target = self
             item?.toolTip = NSLocalizedString("View Settings", comment: "")
             item?.titleName = NSLocalizedString("View Settings", comment: "")
@@ -2222,6 +2228,8 @@ extension KMToolbarViewController {
             item?.btnAction = #selector(_itemAction)
         } else if identifier == KMToolbarCropIdentifier {
             item?.image = NSImage(named: KMImageNameUXIconSubtoolbarDisplayTailor)
+            item?.selectedImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayTailorHighlight")
+            item?.alternateImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayTailorHighlight")
             item?.target = self
 //            item?.toolTip = NSLocalizedString("Note: Cropping a PDF hides some of the PDF’s content without removing it.", comment: "")
             item?.titleName = NSLocalizedString("Crop", comment: "")
@@ -2242,6 +2250,8 @@ extension KMToolbarViewController {
             item?.menuFormRepresentation = menuItem
         } else if identifier == KMToolbarSnapshotIdentifier {
             item?.image = NSImage(named: KMImageNameUXIconSubtoolbarDisplaySnapshot)
+            item?.selectedImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight")
+            item?.alternateImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplaySnapshotHighlight")
             item?.target = self
             item?.toolTip = NSLocalizedString("Take Snapshot", comment: "")
             item?.titleName = NSLocalizedString("Snapshot", comment: "")
@@ -2249,6 +2259,8 @@ extension KMToolbarViewController {
             item?.btnAction = #selector(_itemAction)
         } else if identifier == KMToolbarTTSIdentifier {
             item?.image = NSImage(named: KMImageNameUXIconSubtoolbarDisplayTTS)
+            item?.selectedImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayTTSHighlight")
+            item?.alternateImage = NSImage(named: "KMImageNameUXIconSubtoolbarDisplayTTSHighlight")
             item?.target = self
             item?.toolTip = NSLocalizedString("TTS (Text-to-speech)", comment: "")
             item?.titleName = NSLocalizedString("TTS", comment: "")

+ 12 - 0
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -90,6 +90,10 @@ extension KMMainViewController {
                     let color = KMPreference.shared.markupHighlightColor
                     let imageV = KMNoteTypeImageView()
                     item.image = imageV.noteTypeImage(withType: SKNHighlightString, color: color)
+                    item.selectedImage = imageV.noteTypeImage(withType: SKNHighlightStringHighlight, color: color)
+                    item.alternateImage = imageV.noteTypeImage(withType: SKNHighlightStringHighlight, color: color)
+                    let isSel = item.isSelected
+                    item.isSelected = isSel
                 }
             }
         }
@@ -99,6 +103,10 @@ extension KMMainViewController {
                     let color = KMPreference.shared.markupUnderlineColor
                     let imageV = KMNoteTypeImageView()
                     item.image = imageV.noteTypeImage(withType: SKNUnderlineString, color: color)
+                    item.selectedImage = imageV.noteTypeImage(withType: SKNUnderlineStringHighlight, color: color)
+                    item.alternateImage = imageV.noteTypeImage(withType: SKNUnderlineStringHighlight, color: color)
+                    let isSel = item.isSelected
+                    item.isSelected = isSel
                 }
             }
         }
@@ -108,6 +116,10 @@ extension KMMainViewController {
                     let color = KMPreference.shared.markupStrikthroughColor
                     let imageV = KMNoteTypeImageView()
                     item.image = imageV.noteTypeImage(withType: SKNStrikeOutString, color: color)
+                    item.selectedImage = imageV.noteTypeImage(withType: SKNStrikeOutStringHighlight, color: color)
+                    item.alternateImage = imageV.noteTypeImage(withType: SKNStrikeOutStringHighlight, color: color)
+                    let isSel = item.isSelected
+                    item.isSelected = isSel
                 }
             }
         }

+ 68 - 4
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -374,10 +374,42 @@
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2319"
-            endingLineNumber = "2319"
+            startingLineNumber = "2331"
+            endingLineNumber = "2331"
             landmarkName = "_setupToolItem(_:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66ae096"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
+                  moduleName = "PDFull"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2331"
+                  endingLineNumber = "2331"
+                  offsetFromSymbolStart = "9656">
+               </Location>
+               <Location
+                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66ae012"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
+                  moduleName = "PDFull"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2335"
+                  endingLineNumber = "2335"
+                  offsetFromSymbolStart = "8948">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -550,10 +582,42 @@
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2042"
-            endingLineNumber = "2042"
+            startingLineNumber = "2046"
+            endingLineNumber = "2046"
             landmarkName = "_setupFillSignItem(_:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "DFE7612C-6ABD-4EA9-87C7-A03D218AAE85 - ae9d20bb24b01099"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDFull.KMToolbarViewController._setupFillSignItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
+                  moduleName = "PDFull"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2046"
+                  endingLineNumber = "2046"
+                  offsetFromSymbolStart = "9996">
+               </Location>
+               <Location
+                  uuid = "DFE7612C-6ABD-4EA9-87C7-A03D218AAE85 - ae9d20bb24b01099"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDFull.KMToolbarViewController._setupFillSignItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
+                  moduleName = "PDFull"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2046"
+                  endingLineNumber = "2046"
+                  offsetFromSymbolStart = "9128">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy