@@ -378,7 +378,7 @@ class KMBatchOperateAddWatermarkViewController: KMBatchOperateBaseViewController
controller.cancelAction = { [unowned self] wmWindowC in
self.km_endSheet()
}
- controller.operateCallBack = { controller, watermark, countType in
+ controller.operateCallBack = { [unowned self] controller, watermark, countType in
self.currentType = KMWatermarkType(rawValue: countType) ?? .txt
self._loadData()
var haveWaters = false
@@ -646,7 +646,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
func toolbar(_ toolbar: KMToolbarView, itemFor identifier: String) -> KMToolbarItemView {
var item: KMToolbarItemView? = self.toolbarItems[identifier] as? KMToolbarItemView
- var create = true
+ var create = false
if let data = item {
let pId = parentIdentifier(data.itemIdentifier ?? "")
if [.Annatiton,.Magnify,.Move,.Select,.SelectZoom].contains(toolbarType) && (pId != KMDocumentAnnotationToolbarItemIdentifier || data.itemIdentifier! == KMToolbarAnnotationSettingItemIdentifier) {