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

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab/CTTabController.m

@@ -173,29 +173,47 @@ static NSString* const kBrowserThemeDidChangeNotification =
 
     self.tabView.wantsLayer = YES;
     NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+    
+    BOOL isDarkModel = [KMAdvertisementConfig isDarkModel];
+    NSColor *backgroundColor_Norm = [NSColor km_initWithHex:@"#D5D5D5" alpha:1];
+    NSColor *backgroundColor_Hov = [NSColor km_initWithHex:@"#FCFDFF" alpha:1];
+    NSColor *backgroundColor_Sel = [NSColor km_initWithHex:@"#FCFDFF" alpha:1];
+    
+    NSColor *backgroundColor_Norm_Dark = [NSColor km_initWithHex:@"#393C3E" alpha:1];
+    NSColor *backgroundColor_Hov_Dark = [NSColor km_initWithHex:@"#424345" alpha:1];
+    NSColor *backgroundColor_Sel_Dark = [NSColor km_initWithHex:@"#424345" alpha:1];
+    
+    NSColor *text_Norm = [NSColor km_initWithHex:@"#42464D" alpha:1];
+    NSColor *text_Hov = [NSColor km_initWithHex:@"#0E1114" alpha:1];
+    NSColor *text_Sel = [NSColor km_initWithHex:@"#0E1114" alpha:1];
+    
+    NSColor *text_Norm_Dark = [NSColor km_initWithHex:@"#7E7F85" alpha:1];
+    NSColor *text_Hov_Dark = [NSColor km_initWithHex:@"#C8C9CC" alpha:1];
+    NSColor *text_Sel_Dark = [NSColor km_initWithHex:@"#C8C9CC" alpha:1];
+    
     if (state_ == KMDesignTokenStateNorm) {
-        self.tabView.layer.backgroundColor = NSColor.clearColor.CGColor;
+        self.tabView.layer.backgroundColor = isDarkModel ? backgroundColor_Norm_Dark.CGColor : backgroundColor_Norm.CGColor;
         self.tabView.layer.borderColor = self.borderColor.CGColor;
         self.tabView.layer.cornerRadius = self.borderRadiusTopLeft;
         style.lineSpacing = self.lineHeight;
         titleView_.font = self.font;
-        titleView_.textColor = self.textFill;
+        titleView_.textColor = isDarkModel ? text_Norm_Dark : text_Norm;
     } else if (state_ == KMDesignTokenStateHov) {
-        self.tabView.layer.backgroundColor = self.fill_hov.CGColor;
+        self.tabView.layer.backgroundColor = isDarkModel ? backgroundColor_Hov_Dark.CGColor : backgroundColor_Hov.CGColor;;
         self.tabView.layer.borderColor = self.borderColor_hov.CGColor;
         self.tabView.layer.cornerRadius = self.borderRadiusTopLeft_hov;
         self.tabView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
         style.lineSpacing = self.lineHeight_hov;
         titleView_.font = self.font_hov;
-        titleView_.textColor = self.textFill_hov;
+        titleView_.textColor = isDarkModel ? text_Hov_Dark : text_Hov;
     } else if (state_ == KMDesignTokenStateSel) {
-        self.tabView.layer.backgroundColor = self.fill_sel.CGColor;
+        self.tabView.layer.backgroundColor = isDarkModel ? backgroundColor_Sel_Dark.CGColor : backgroundColor_Sel.CGColor;;
         self.tabView.layer.borderColor = self.borderColor_sel.CGColor;
         self.tabView.layer.cornerRadius = self.borderRadiusTopLeft_sel;
         self.tabView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
         style.lineSpacing = self.lineHeight_sel;
         titleView_.font = self.font_sel;
-        titleView_.textColor = self.textFill_sel;
+        titleView_.textColor = isDarkModel ? text_Sel_Dark : text_Sel;
     }
 //    titleView_.attributedStringValue = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSParagraphStyleAttributeName:style}];
 }

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -87,8 +87,6 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
     private var fileAttri_: KMFileAttribute?
     
     deinit {
-        self.prePDFView.document = nil
-        self.tempPDFDocument = nil
 #if DEBUG
         NSLog("====KMConvertWindowController==deinit")
 #endif
@@ -544,12 +542,8 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                 print("Error removing item at path: (error.localizedDescription)")
             }
         }
-//        if #available(macOS 10.13, *) {
-//            self.window?.endSheet(sender.window!)
-//        } else {
-//            NSApp.endSheet(self.window!)
-//        }
-//        self.window?.orderOut(self)
+        self.prePDFView.document = nil
+        self.tempPDFDocument = nil
         self.km_quick_endSheet()
     }
     func showCriticalAlert(_ alertMsg: String?) {