🐛 过早优化万恶之源

tw93 · Oct 1, 2022 · f841292 · f841292
1 parent bef90e5
commit f841292
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/Mac/View/EditTextView.swift b/Mac/View/EditTextView.swift
@@ -34,18 +34,18 @@ class EditTextView: NSTextView, NSTextFinderClient {
     override func drawInsertionPoint(in rect: NSRect, color: NSColor, turnedOn flag: Bool) {
         var newRect = NSRect(origin: rect.origin, size: rect.size)
         newRect.size.width = caretWidth
+        var diff = 4.0
         if let range = getParagraphRange(), range.upperBound != textStorage?.length || (
             range.upperBound == textStorage?.length
                 && textStorage?.string.last == "\n"
                 && selectedRange().location != textStorage?.length
         ) {
-            newRect.size.height = newRect.size.height - 6.0
-            newRect.origin.y = newRect.origin.y + 4.0
-        } else {
-            newRect.size.height = newRect.size.height - 4.0
-            newRect.origin.y = newRect.origin.y + 4.0
+            diff = 6.0
         }
 
+        newRect.size.height = newRect.size.height - diff
+        newRect.origin.y = newRect.origin.y + 4.0
+
         super.drawInsertionPoint(in: newRect, color: EditTextView.fontColor, turnedOn: flag)
     }
 

diff --git a/Mac/ViewController.swift b/Mac/ViewController.swift
@@ -403,8 +403,9 @@ class ViewController:
         editArea.isEditable = false
 
         editArea.layoutManager?.defaultAttachmentScaling = .scaleProportionallyDown
-        editArea.layoutManager?.typesetterBehavior = .behavior_10_2_WithCompatibility
-
+        if UserDefaultsManagement.fontName != "LXGW WenKai Lite" {
+            editArea.layoutManager?.typesetterBehavior = .behavior_10_2_WithCompatibility
+        }
         search.font = UserDefaultsManagement.searchFont
         editArea.font = UserDefaultsManagement.noteFont
         titleLabel.font = UserDefaultsManagement.titleFont.titleBold()
@@ -1799,17 +1800,17 @@ class ViewController:
 
         return !note.name.isEmpty
             && (filter.isEmpty || isMatched(note: note, terms: terms!)
-        ) && (
-            type == .All && note.project.showInCommon
-                || (
-                type != .All && projects!.contains(note.project)
-                    || (note.project.parent != nil && projects!.contains(note.project.parent!))
+            ) && (
+                type == .All && note.project.showInCommon
+                    || (
+                        type != .All && projects!.contains(note.project)
+                            || (note.project.parent != nil && projects!.contains(note.project.parent!))
+                    )
+                    || type == .Trash
+            ) && (
+                type == .Trash && note.isTrash()
+                    || type != .Trash && !note.isTrash()
             )
-                || type == .Trash
-        ) && (
-            type == .Trash && note.isTrash()
-                || type != .Trash && !note.isTrash()
-        )
     }
 
     public func contains(tag name: String, in tags: [String]) -> Bool {