Repo // Utilizing NSAttributedString.boundingDimension.

Packages/Fuziki_NSAttributedTextView/Package.swift

@@ -12,11 +12,15 @@ let package = Package(
       targets: ["NSAttributedTextView"]
     ),
   ],
-  dependencies: [],
+  dependencies: [
+    .package(path: "../vChewing_CocoaExtension"),
+  ],
   targets: [
     .target(
       name: "NSAttributedTextView",
-      dependencies: []
+      dependencies: [
+        .product(name: "CocoaExtension", package: "vChewing_CocoaExtension"),
+      ]
     ),
   ]
 )

Packages/Fuziki_NSAttributedTextView/Sources/NSAttributedTextView/NSAttributedTextView.swift

@@ -6,6 +6,7 @@
 // Modified by The vChewing Project in order to use it with AppKit.
 
 import Cocoa
+import CocoaExtension
 import SwiftUI
 
 @available(macOS 10.15, *)
@@ -107,20 +108,14 @@ public class NSAttributedTextView: NSView {
       default: return attributedStringValue(areaCalculation: true)
       }
     }()
-    var rect = attrString.boundingRect(
+    var textWH = attrString.boundingDimension
-      with: NSSize(width: 1600.0, height: 1600.0),
-      options: [.usesLineFragmentOrigin, .usesFontLeading, .usesDeviceMetrics]
-    )
-    rect.size.height *= 1.03
-    rect.size.height = max(rect.size.height, NSFont.systemFontSize * 1.1)
-    rect.size.height = ceil(rect.size.height)
-    rect.size.width *= 1.03
-    rect.size.width = max(rect.size.width, NSFont.systemFontSize * 1.05)
-    rect.size.width = ceil(rect.size.width)
     if direction != .horizontal {
-      rect = .init(x: rect.minX, y: rect.minY, width: rect.height, height: rect.width)
+      textWH.height *= 1.03
+      textWH.height = max(textWH.height, NSFont.systemFontSize * 1.1)
+      textWH.height = ceil(textWH.height)
+      textWH = .init(width: textWH.height, height: textWH.width)
     }
-    return rect
+    return .init(origin: .zero, size: textWH)
   }
 
   override public func draw(_ rect: CGRect) {

Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift

@@ -58,11 +58,7 @@ public class CandidateCellData: Hashable {
 
   public var cellLength: Int {
     if displayedText.count <= 2 { return Int(ceil(size * 3)) }
-    let rect = attributedStringForLengthCalculation.boundingRect(
+    return Int(ceil(attributedStringForLengthCalculation.boundingDimension.width))
-      with: NSSize(width: 1600.0, height: 1600.0), options: [.usesLineFragmentOrigin]
-    )
-    let rawResult = ceil(rect.width)
-    return Int(rawResult)
   }
 
   public var attributedStringHeader: NSAttributedString {

Packages/vChewing_NotifierUI/Package.swift

@@ -12,11 +12,15 @@ let package = Package(
       targets: ["NotifierUI"]
     ),
   ],
-  dependencies: [],
+  dependencies: [
+    .package(path: "../vChewing_CocoaExtension"),
+  ],
   targets: [
     .target(
       name: "NotifierUI",
-      dependencies: []
+      dependencies: [
+        .product(name: "CocoaExtension", package: "vChewing_CocoaExtension"),
+      ]
     ),
   ]
 )

Packages/vChewing_NotifierUI/Sources/NotifierUI/NotifierUI.swift

@@ -7,6 +7,7 @@
 // requirements defined in MIT License.
 
 import Cocoa
+import CocoaExtension
 
 public class Notifier: NSWindowController {
   public static func notify(message: String) {
@@ -78,10 +79,8 @@ public class Notifier: NSWindowController {
     let attrStringAlt = NSMutableAttributedString(string: additionalString, attributes: attrAlt)
     attrString.insert(attrStringAlt, at: attrString.length)
 
-    let textRect: NSRect = attrString.boundingRect(
+    let textWH = attrString.boundingDimension
-      with: NSSize(width: 1600.0, height: 1600.0), options: [.usesLineFragmentOrigin]
+    let windowWidth = Double(4) * kLargeFontSize + textWH.width
-    )
-    let windowWidth = Double(4) * kLargeFontSize + textRect.width
     let contentRect = NSRect(x: 0, y: 0, width: windowWidth, height: 60.0)
     var windowRect = contentRect
     windowRect.origin.x = screenRect.maxX - windowRect.width - 10
@@ -123,8 +122,8 @@ public class Notifier: NSWindowController {
     theWindow.contentView?.addSubview(lblMessage)
 
     let x = lblMessage.frame.origin.x
-    let y = ((theWindow.frame.height) - textRect.height) / 1.9
+    let y = ((theWindow.frame.height) - textWH.height) / 1.9
-    let newFrame = NSRect(x: x, y: y, width: theWindow.frame.width, height: textRect.height)
+    let newFrame = NSRect(x: x, y: y, width: theWindow.frame.width, height: textWH.height)
     lblMessage.frame = newFrame
 
     super.init(window: theWindow)

Packages/vChewing_PopupCompositionBuffer/Sources/PopupCompositionBuffer/PopupCompositionBuffer.swift

@@ -164,13 +164,10 @@ public class PopupCompositionBuffer: NSWindowController {
 
   private func adjustSize() {
     let attrString = messageTextField.attributedStringValue
-    var rect = attrString.boundingRect(
+    var rect = NSRect(origin: .zero, size: attrString.boundingDimension)
-      with: NSSize(width: 1600.0, height: 1600.0),
-      options: [.usesLineFragmentOrigin, .usesFontLeading]
-    )
-    rect.size.width = max(rect.size.width, 20 * Double(attrString.string.count)) + 2
     rect.size.height *= 1.2
     rect.size.height = max(22, rect.size.height)
+    rect.size.width = max(rect.size.width, 20 * Double(attrString.string.count)) + 2
     if isTypingDirectionVertical {
       rect = .init(x: rect.minX, y: rect.minY, width: rect.height, height: rect.width)
     }

Source/Modules/InputHandler_Core.swift

@@ -119,7 +119,7 @@ public class InputHandler: InputHandlerProtocol {
 
   var isHaninKeyboardSymbolMode = false
 
-  static let tooltipHaninKeyboardSymbolMode: String = "\("Hanin Keyboard Symbol Input.".localized)　　"
+  static let tooltipHaninKeyboardSymbolMode: String = "\("Hanin Keyboard Symbol Input.".localized)"
 
   // MARK: - Codepoint Input Buffer.
 
@@ -134,12 +134,13 @@ public class InputHandler: InputHandlerProtocol {
   var tooltipCodePointInputMode: String {
     let commonTerm = NSMutableString()
     commonTerm.insert("Code Point Input.".localized, at: 0)
-    switch IMEApp.currentInputMode {
+    if !(delegate?.isVerticalTyping ?? false) {
-    case .imeModeCHS: commonTerm.insert("[GB] ", at: 0)
+      switch IMEApp.currentInputMode {
-    case .imeModeCHT: commonTerm.insert("[Big5] ", at: 0)
+      case .imeModeCHS: commonTerm.insert("[GB] ", at: 0)
-    default: break
+      case .imeModeCHT: commonTerm.insert("[Big5] ", at: 0)
+      default: break
+      }
     }
-    commonTerm.append("　　")
     return commonTerm.description
   }
 

Source/Modules/InputHandler_HandleComposition.swift

@@ -204,7 +204,7 @@ extension InputHandler {
       if calligrapher.isEmpty, isWildcardKeyInput {
         delegate.callError("3606B9C0")
         var newEmptyState = compositor.isEmpty ? IMEState.ofEmpty() : generateStateOfInputting()
-        newEmptyState.tooltip = NSLocalizedString("Wildcard key cannot be the initial key.", comment: "") + "　　"
+        newEmptyState.tooltip = NSLocalizedString("Wildcard key cannot be the initial key.", comment: "")
         newEmptyState.data.tooltipColorState = .redAlert
         newEmptyState.tooltipDuration = 1.0
         delegate.switchState(newEmptyState)
@@ -345,7 +345,7 @@ extension InputHandler {
         delegate.callError("D220B880：輸入的字碼沒有對應的字元。")
         var updatedState = IMEState.ofAbortion()
         updatedState.tooltipDuration = 0
-        updatedState.tooltip = "Invalid Code Point.".localized + "　　"
+        updatedState.tooltip = "Invalid Code Point.".localized
         delegate.switchState(updatedState)
         isCodePointInputMode = true
         return true

Source/Modules/InputHandler_HandleStates.swift

@@ -166,7 +166,7 @@ extension InputHandler {
         return true
       }
       var newState = generateStateOfInputting()
-      newState.tooltip = NSLocalizedString(tooltipMessage, comment: "") + "　　"
+      newState.tooltip = NSLocalizedString(tooltipMessage, comment: "")
       newState.data.tooltipColorState = tooltipColorState
       newState.tooltipDuration = 1.85
       delegate.switchState(newState)
@@ -185,7 +185,7 @@ extension InputHandler {
         return true
       }
       var newState = generateStateOfInputting()
-      newState.tooltip = NSLocalizedString(tooltipMessage, comment: "") + "　　"
+      newState.tooltip = NSLocalizedString(tooltipMessage, comment: "")
       newState.data.tooltipColorState = .warning
       newState.tooltipDuration = 1.85
       delegate.switchState(newState)
@@ -808,7 +808,6 @@ extension InputHandler {
     } else {
       newTooltip.insert((newIndex + 1).description + " / " + candidates.count.description, at: 0)
     }
-    newTooltip.append("　　")
     newState.tooltip = newTooltip.description
     vCLog(newState.tooltip)
     newState.tooltipDuration = 0

Source/Modules/SessionCtl_Delegates.swift

@@ -233,7 +233,7 @@ extension SessionCtl: CtlCandidateDelegate {
       tooltipMessage = succeeded ? "! Succeeded in filtering a candidate." : "⚠︎ Failed from filtering a candidate."
     }
     if !succeeded { newState.data.tooltipColorState = .redAlert }
-    newState.tooltip = NSLocalizedString(tooltipMessage, comment: "") + "　　"
+    newState.tooltip = NSLocalizedString(tooltipMessage, comment: "")
     switchState(newState)
   }
 }

Source/Modules/SessionCtl_HandleEvent.swift

@@ -99,7 +99,7 @@ public extension SessionCtl {
     if !LMMgr.currentLM.isCoreLMLoaded {
       if (event as InputSignalProtocol).isReservedKey { return false }
       var newState: IMEStateProtocol = IMEState.ofEmpty()
-      newState.tooltip = NSLocalizedString("Factory dictionary not loaded yet.", comment: "") + "　　"
+      newState.tooltip = NSLocalizedString("Factory dictionary not loaded yet.", comment: "")
       newState.tooltipDuration = 1.85
       newState.data.tooltipColorState = .redAlert
       switchState(newState)