【注释回复】暗黑场景图片补充

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteExpand.imageset/ic 1.pdf

@@ -11,7 +11,7 @@ stream
 /DeviceRGB cs
 q
 -1.000000 -0.000000 -0.000000 1.000000 12.000000 5.000000 cm
-0.152276 0.234759 0.385445 scn
+0.305882 0.498039 0.858824 scn
 8.000000 4.989752 m
 3.995897 0.000000 l
 0.000000 5.000000 l

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkSelected.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "state=normal, Switch=yes 1.pdf",
+      "filename" : "Switch=yes, Property 2=nor.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkSelected.imageset/state=normal, Switch=yes 1.pdf

@@ -1,59 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Filter /FlateDecode
-     /Length 3 0 R
-  >>
-stream
-x
m’Ën!E÷|ëJ%x€ض•ºnû	(U*%‘ªHýþ^ó0äÁ&7Çñ±3Ìîmÿ÷“÷Ÿï/úõKíÆ·|Q¿ŠŒ-GÛž%Im1
sÈ'eÍŠ„|.ùñÊgÓäzÓI!»r&zdê—à"Mô*=ªBâœ×™»;í#‹R`ØüJ‰{ºGjMƒu:‚¯[„A'’ÎæpWB;ØÕY›ä«¨Â±Q“L{ÃÁ–�²:à©#á0†��| 8š¼a¡�¸‹"\4)ŠQ6l<¡XQ<ƒNéQµyÊ�ÚGB)p¬&žñšÆ
_·;â/7‰°)Ü–D�Ñ€#“øFj3>¥¸íÌB¸”
O5™ˆžÕFd¶‚·:rκEÚC,ŽdC
,«µ5®µ�g”‹—˜ðJ,㉨:X&¤(êLal(«q(ªRâýËÏy¢~¥¾ŸÔY}¨ApÎq
-endstream
-endobj
-
-3 0 obj
-  350
-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
-0000000468 00000 n
-0000000490 00000 n
-0000000663 00000 n
-0000000737 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-796
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkSelectedCover.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "state=hover, Switch=yes 1.pdf",
+      "filename" : "Switch=yes, Property 2=hov.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkSelectedCover.imageset/state=hover, Switch=yes 1.pdf

@@ -1,63 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << /ExtGState << /E1 << /ca 0.100000 >> >> >>
-endobj
-
-2 0 obj
-  << /Filter /FlateDecode
-     /Length 3 0 R
-  >>
-stream
-x
m”ËŽ!E÷|ëH¡1ïÚ桬“|šÉDê)j)ߟk
-l2ݬÜÇű)}ùòô÷wúñí“ýüÓ\ôW¿™?æò•ì¯›!çDz~%ºÏIÐ_�w¡¶	0‰¨!hÕçÖì­¿!�ç°,WƲ¼ËRsÙ×BEÒbK6H2º8Ö†ºQ�Ò«Q�R�e—§Á©t–LP*”ÖÔ£¹©ÙP7b†OIV&ÁLm�‹ o¯J*]Í‹y6oæ;Æw?›sh›—cnâû€çFgµj)®M¯1ÚÂÚ(Ž]
-96ÚèÑ£,$ç
/ºJ¥À\S¡ƒ÷,�ä¦í,ß²ƒN$‹íÁ]
-ÛYÀ®Åf%þ0v¨MÉÖ7lQÔ17Žy X–’c¡ç;4„ÁR–¤¡Ã©Á+ŠÅ£t‹e§gLDé*	¥@mM<z€©‰Šà[aWyJ„mÁû”öë0+ñD^LÅ:Zȸ9�0”Š·z¸†=…oÓdD®¶œ“·ÙQŒ>îh(ŽJ(¢p8ŸÏ€eg®´rnàšŠºaqh>	�£<�–	Š³¦06ŒÖ8ª‘âþÇã\QRÏÆÁ?†1$
-
-endstream
-endobj
-
-3 0 obj
-  463
-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
-0000000074 00000 n
-0000000621 00000 n
-0000000643 00000 n
-0000000816 00000 n
-0000000890 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-949
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkup.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "state=normal, Switch=No 1.pdf",
+      "filename" : "Switch=no, Property 2=nor.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteMarkupCover.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "state=hover, Switch=No 1.pdf",
+      "filename" : "Switch=no, Property 2=hov.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteOpration.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "sidebar 1.pdf",
+      "filename" : "sidebar-2.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteOpration.imageset/sidebar 1.pdf

@@ -11,7 +11,7 @@ stream
 /DeviceRGB cs
 q
 1.000000 0.000000 -0.000000 1.000000 4.000000 3.500000 cm
-0.262745 0.278431 0.301961 scn
+0.784314 0.788235 0.800000 scn
 4.000000 11.500000 m
 8.500000 11.500000 l
 10.156855 11.500000 11.500000 10.156855 11.500000 8.500000 c

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteStateNone.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "None 1.pdf",
+      "filename" : "sidebar-2.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteStateNone.imageset/None 1.pdf

@@ -1,95 +0,0 @@
-%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.000000 cm
-0.262745 0.278431 0.301961 scn
-4.000000 13.500000 m
-10.500000 13.500000 l
-12.156854 13.500000 13.500000 12.156855 13.500000 10.500000 c
-13.500000 4.000000 l
-13.500000 2.343146 12.156854 1.000000 10.500000 1.000000 c
-1.000000 1.000000 l
-1.000000 10.500000 l
-1.000000 12.156854 2.343146 13.500000 4.000000 13.500000 c
-h
-0.000000 10.500000 m
-0.000000 12.709139 1.790861 14.500000 4.000000 14.500000 c
-10.500000 14.500000 l
-12.709139 14.500000 14.500000 12.709139 14.500000 10.500000 c
-14.500000 4.000000 l
-14.500000 1.790861 12.709139 0.000000 10.500000 0.000000 c
-1.000000 0.000000 l
-0.000000 0.000000 l
-0.000000 1.000000 l
-0.000000 10.500000 l
-h
-4.500000 7.500000 m
-4.000000 7.500000 l
-4.000000 6.500000 l
-4.500000 6.500000 l
-10.500000 6.500000 l
-11.000000 6.500000 l
-11.000000 7.500000 l
-10.500000 7.500000 l
-4.500000 7.500000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  926
-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
-0000001016 00000 n
-0000001038 00000 n
-0000001211 00000 n
-0000001285 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1344
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteStateNone.imageset/sidebar-2.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 4.000000 3.500000 cm
+0.784314 0.788235 0.800000 scn
+4.000000 11.500000 m
+8.500000 11.500000 l
+10.156855 11.500000 11.500000 10.156855 11.500000 8.500000 c
+11.500000 4.000000 l
+11.500000 2.343145 10.156855 1.000000 8.500000 1.000000 c
+1.000000 1.000000 l
+1.000000 8.500000 l
+1.000000 10.156855 2.343146 11.500000 4.000000 11.500000 c
+h
+0.000000 8.500000 m
+0.000000 10.709139 1.790861 12.500000 4.000000 12.500000 c
+8.500000 12.500000 l
+10.709139 12.500000 12.500000 10.709139 12.500000 8.500000 c
+12.500000 4.000000 l
+12.500000 1.790861 10.709139 0.000000 8.500000 0.000000 c
+1.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 1.000000 l
+0.000000 8.500000 l
+h
+3.879310 6.534483 m
+3.379310 6.534483 l
+3.379310 5.534483 l
+3.879310 5.534483 l
+9.051724 5.534483 l
+9.551724 5.534483 l
+9.551724 6.534483 l
+9.051724 6.534483 l
+3.879310 6.534483 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  913
+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
+0000001003 00000 n
+0000001025 00000 n
+0000001198 00000 n
+0000001272 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1331
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameNoteStateMore.imageset/Contents.json

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

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameNoteStateMore.imageset/ic 1.pdf

@@ -0,0 +1,70 @@
+%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 12.000000 5.000000 cm
+0.784314 0.788235 0.800000 scn
+8.000000 4.989752 m
+3.995897 0.000000 l
+0.000000 5.000000 l
+8.000000 4.989752 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  211
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000301 00000 n
+0000000323 00000 n
+0000000496 00000 n
+0000000570 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+629
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameNoteStateMore.imageset/ic.pdf

@@ -0,0 +1,70 @@
+%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 12.000000 5.000000 cm
+0.152276 0.234759 0.385445 scn
+8.000000 4.989752 m
+3.995897 0.000000 l
+0.000000 5.000000 l
+8.000000 4.989752 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  211
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000301 00000 n
+0000000323 00000 n
+0000000496 00000 n
+0000000570 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+629
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFooterCellView.swift

@@ -50,7 +50,7 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
 //        self.replyBox.fillColor = .red
         self.inputBox.cornerRadius = 0
         self.inputBox.borderColor = NSColor(white: 0, alpha: 0.2)
-        self.inputBox.fillColor = .white
+
         self.inputBox.moveCallback = { [weak self] enter, theBox in
             if enter {
                 theBox.borderColor = NSColor.km_init(hex: "#1770F4")
@@ -64,7 +64,6 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
         }
         self.inputBox.downCallback = { [weak self] enter, theBox, _ in
             theBox.window?.makeFirstResponder(self?.inputTextF)
-            
         }
         self.inputTextF.drawsBackground = false
         self.inputTextF.isBordered = false
@@ -74,8 +73,18 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
         self.inputTextF.wantsLayer = true
         self.inputTextF.layer?.backgroundColor = .clear
         self.inputTextF.delegate = self
+        let cell = self.inputTextF.cell as? NSTextFieldCell
+//        cell?.drawsBackground = false
+        cell?.backgroundColor = .red
         self.inputTextF.firstResponderHandler = { [weak self] result in
             self?.flag_ = result
+            for sv in self?.inputTextF.subviews ?? [] {
+                for childsv in sv.subviews {
+                    if let data = childsv as? NSTextView {
+                        data.backgroundColor = .clear
+                    }
+                }
+            }
             if result {
                 self?.inputBox.borderColor = NSColor.km_init(hex: "#1770F4")
             } else {
@@ -108,7 +117,7 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
         
         self.operationBox.borderWidth = 0
         self.operationIv.image = NSImage(named: "KMImageNameBotaNoteOpration")
-        self.operationIv2.image = NSImage(named: "KMImageNameBotaNoteExpand")
+        self.operationIv2.image = NSImage(named: "KMImageNameNoteStateMore")
         self.operationButton.title = ""
         self.operationButton.target = self
         self.operationButton.action = #selector(operationAction)
@@ -168,6 +177,16 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
     @objc func operationAction(_ sender: NSButton) {
         self.itemClick?(2, sender)
     }
+    
+    override func updateLayer() {
+        super.updateLayer()
+        
+        if KMAppearance.isDarkMode() {
+            self.inputBox.fillColor = NSColor(hex: "#393C3E")
+        } else {
+            self.inputBox.fillColor = .white
+        }
+    }
 }
 
 extension KMNoteFooterCellView: NSTextFieldDelegate {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMSectionCellView.swift

@@ -42,13 +42,21 @@ class KMSectionCellView: NSTableCellView, NibLoadable {
         super.awakeFromNib()
         
         self.expandButton.target = self
-        self.expandButton.action = #selector(expandAction)
-        
-        self.wantsLayer = true
-        self.layer?.backgroundColor = NSColor(hex: "#EAECF2").cgColor
+        self.expandButton.action = #selector(expandAction) 
     }
     
     @objc func expandAction() {
         self.itemClick?(1)
     }
+    
+    override func updateLayer() {
+        super.updateLayer()
+        
+        self.wantsLayer = true
+        if KMAppearance.isDarkMode() {
+            self.layer?.backgroundColor = NSColor(hex: "#424345").cgColor
+        } else {
+            self.layer?.backgroundColor = NSColor(hex: "#EAECF2").cgColor
+        }
+    }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -2137,9 +2137,9 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
                     } else if idx == 3 { // reply
                         let content = param.first as? String ?? ""
                         if content.isEmpty {
-                            Task {
-                                _ = await KMAlertTool.runModel(message: NSLocalizedString("Error", comment: ""))
-                            }
+//                            Task {
+//                                _ = await KMAlertTool.runModel(message: NSLocalizedString("Error", comment: ""))
+//                            }
                             return
                         }
                         if let con = data.replyModel?.replyAnno?.contents, con.isEmpty == false {