Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFTools/Background/New/View/KMAddBackgroundView.swift

@@ -426,7 +426,8 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
         if let color = background.color {
             tBackground.color = color
             tBackground.type = .color
-        } else if background.imagePath.count != 0 {
+        }
+        if background.imagePath.count != 0 {
             let image = NSImage(contentsOfFile: background.imagePath)!
             tBackground.setImage(image)
             tBackground.type = .image

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.m

@@ -266,7 +266,7 @@ CGFloat DEFAULT_SNAPSHOT_HEIGHT = 200.0;
         self.lastAddAnnotationPoint = bounds.origin;
         
         KMAnnotationStamp *newAnnotation = [[KMAnnotationStamp alloc] initWithBounds:bounds];
-//        newAnnotation.image = image;
+        newAnnotation.image = image;
         
         [newAnnotation registerUserName];
         [self addAnnotation:newAnnotation toPage:page];