staticプロパティをインスタンスプロパティに変更

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

diff --git a/KCD/StrengthenListItemView.swift b/KCD/StrengthenListItemView.swift
index 826990e..ab9feed 100644 (file)
--- a/KCD/StrengthenListItemView.swift
+++ b/KCD/StrengthenListItemView.swift
@@ -8,24 +8,30 @@
 
 import Cocoa
 
-class StrengthenListItemView: NSBox {
+final class StrengthenListItemView: NSBox {
+    
     override func draw(_ dirtyRect: NSRect) {
+        
         super.draw(dirtyRect)
         
-        let bounds = self.bounds
         let width = bounds.width
         let height = bounds.height
-        NSColor.gridColor.set()
-        NSBezierPath.setDefaultLineWidth(1.0)
+        
+        borderColor.set()
+        NSBezierPath.defaultLineWidth = borderWidth
         NSBezierPath.stroke(bounds)
-        multiline {
-            [(NSPoint, NSPoint)]()
-                .appended { (NSPoint(x: 29.5, y: 0), NSPoint(x: 29.5, y: height)) }
-                .appended { (NSPoint(x: 67.5, y: 0), NSPoint(x: 67.5, y: height)) }
-                .appended { (NSPoint(x: 206.5, y: 0), NSPoint(x: 206.5, y: height)) }
-                .appended { (NSPoint(x: 0, y: 17.5), NSPoint(x: width, y: 17.5)) }
-                .appended { (NSPoint(x: 0, y: 34.5), NSPoint(x: width, y: 34.5)) }
-            }
-            .map { $0.stroke() }
+        
+        Polygon()
+            .move(to: NSPoint(x: 29.5, y: 0))
+            .line(to: NSPoint(x: 29.5, y: height))
+            .move(to: NSPoint(x: 67.5, y: 0))
+            .line(to: NSPoint(x: 67.5, y: height))
+            .move(to: NSPoint(x: 227.5, y: 0))
+            .line(to: NSPoint(x: 227.5, y: height))
+            .move(to: NSPoint(x: 0, y: 17.5))
+            .line(to: NSPoint(x: width, y: 17.5))
+            .move(to: NSPoint(x: 0, y: 34.5))
+            .line(to: NSPoint(x: width, y: 34.5))
+            .stroke()
     }
 }