Doutakuを導入

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

diff --git a/KCD/NSTextFieldExtension.swift b/KCD/NSTextFieldExtension.swift
index dc82fce..115d4b3 100644 (file)
--- a/KCD/NSTextFieldExtension.swift
+++ b/KCD/NSTextFieldExtension.swift
@@ -12,20 +12,19 @@ extension NSTextField {
     
     func maskImage(middle1: CGFloat, middle2: CGFloat) -> CGImage {
         
-        let colorspace = CGColorSpaceCreateDeviceGray()
-        
         guard let maskContext = CGContext(data: nil,
                                           width: Int(bounds.width),
                                           height: Int(bounds.height),
                                           bitsPerComponent: 8,
                                           bytesPerRow: Int(bounds.width),
-                                          space: colorspace,
-                                          bitmapInfo: 0)
-            else { fatalError("Can not create bitmap context") }
+                                          space: CGColorSpaceCreateDeviceGray(),
+                                          bitmapInfo: 0) else {
+                                            
+                                            fatalError("Can not create bitmap context")
+        }
         
         let maskGraphicsContext = NSGraphicsContext(cgContext: maskContext, flipped: false)
         
-        
         NSGraphicsContext.saveGraphicsState()
         defer { NSGraphicsContext.restoreGraphicsState() }
         
@@ -37,20 +36,14 @@ extension NSTextField {
                                   (.black, 1.0))
         gradient?.draw(in: bounds, angle: 0.0)
         
-        guard let r = maskContext.makeImage()
-            else { fatalError(" can not create image from context") }
+        guard let r = maskContext.makeImage() else { fatalError(" can not create image from context") }
         
         return r
     }
     
     func isCharacterProtrude() -> Bool {
         
-        guard let currentFont = font else {
-            
-            Swift.print("TextField dose not set font")
-            
-            return false
-        }
+        guard let currentFont = font else { return Logger.shared.log("TextField dose not set font", value: false) }
         
         let string = stringValue as NSString
         let size = string.size(withAttributes: [.font: currentFont])