10.13以降は CGGlyph を使用するようにした

[kcd/KCD.git] / KCD / StrokeTextFieldCell.swift

diff --git a/KCD/StrokeTextFieldCell.swift b/KCD/StrokeTextFieldCell.swift
index 4a4bcd3..7ea4da5 100644 (file)
--- a/KCD/StrokeTextFieldCell.swift
+++ b/KCD/StrokeTextFieldCell.swift
@@ -8,54 +8,82 @@
 
 import Cocoa
 
-class StrokeTextFieldCell: NSTextFieldCell {
+final class StrokeTextFieldCell: NSTextFieldCell {
+    
     private static let boarderWidth: CGFloat = 2.0
     
-    private let layoutManager: NSLayoutManager
-    private let textContainer: NSTextContainer
+    private let layoutManager = NSLayoutManager()
+    private let textContainer = NSTextContainer()
     
     required init(coder: NSCoder) {
-        layoutManager = NSLayoutManager()
-        textContainer = NSTextContainer()
+                
         super.init(coder: coder)
+        
         layoutManager.addTextContainer(textContainer)
     }
     
     override func drawInterior(withFrame cellFrame: NSRect, in controlView: NSView) {
+        
         let attributedString = attributedStringValue
+        
         if attributedString.string.hasSuffix("/") {
+            
             super.drawInterior(withFrame: cellFrame, in: controlView)
+            
             return
         }
+        
         let attribute = attributedString.attributes(at: 0, effectiveRange: nil)
-        guard let forgroundColor = attribute[NSForegroundColorAttributeName] as? NSColor else { return }
-        if forgroundColor == NSColor.controlTextColor {
+        
+        guard let forgroundColor = attribute[.foregroundColor] as? NSColor else {
+            
+            return
+        }
+        
+        if forgroundColor == .controlTextColor {
+            
             super.drawInterior(withFrame: cellFrame, in: controlView)
+            
+            return
+        }
+        
+        guard let font = attribute[.font] as? NSFont else {
+            
             return
         }
-        guard let font = attribute[NSFontAttributeName] as? NSFont else { return }
         
         let textStorage = NSTextStorage(string: attributedString.string, attributes: attribute)
         textStorage.addLayoutManager(layoutManager)
         let range = layoutManager.glyphRange(for: textContainer)
         let glyph = UnsafeMutablePointer<CGGlyph>.allocate(capacity: range.length)
-        let glyphLength = layoutManager.getGlyphs(in: range, glyphs: glyph, properties: nil, characterIndexes: nil, bidiLevels: nil)
+        let glyphLength = layoutManager.getGlyphs(in: range,
+                                                  glyphs: glyph,
+                                                  properties: nil,
+                                                  characterIndexes: nil,
+                                                  bidiLevels: nil)
         var point = NSPoint(x: StrokeTextFieldCell.boarderWidth, y: 0)
         point.y -= font.descender
+        
         if controlView.isFlipped {
+            
             point.y -= controlView.frame.height
         }
-        let nsGlyph = UnsafeMutablePointer<NSGlyph>.allocate(capacity: range.length)
-        for i in 0...range.length {
-            nsGlyph[i] = NSGlyph(glyph[i])
-        }
         
         let path = NSBezierPath()
         path.move(to: point)
-        path.appendGlyphs(nsGlyph, count: glyphLength, in: font)
+        if #available(macOS 13, *) {
+            path.append(withCGGlyphs: glyph, count: glyphLength, in: font)
+        } else {
+            let nsGlyph = UnsafeMutablePointer<NSGlyph>.allocate(capacity: range.length)
+            
+            (0..<range.length).forEach { nsGlyph[$0] = NSGlyph(glyph[$0]) }
+            path.appendGlyphs(nsGlyph, count: glyphLength, in: font)
+        }
         path.lineWidth = StrokeTextFieldCell.boarderWidth
         path.lineJoinStyle = .roundLineJoinStyle
+        
         if controlView.isFlipped {
+            
             var affineTransform = AffineTransform()
             affineTransform.scale(x: 1, y: -1)
             path.transform(using: affineTransform)