OSDN Git Service

HMStrokeTextFieldCellをSwiftに変換した
authormasakih <masakih@users.sourceforge.jp>
Sun, 1 Jan 2017 13:43:16 +0000 (22:43 +0900)
committermasakih <masakih@users.sourceforge.jp>
Sun, 1 Jan 2017 13:43:16 +0000 (22:43 +0900)
KCD.xcodeproj/project.pbxproj
KCD/Base.lproj/HMMediumShipViewController.xib
KCD/Base.lproj/HMResourceViewController.xib
KCD/Base.lproj/HMShipDetailViewController.xib
KCD/HMStrokeTextFieldCell.h [deleted file]
KCD/HMStrokeTextFieldCell.m [deleted file]
KCD/HMStrokeTextFieldCell.swift [new file with mode: 0644]

index 3b93018..74b6f58 100644 (file)
@@ -10,6 +10,7 @@
                F402D5371BE3AFAB008D5881 /* HMSlotResetCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F402D5361BE3AFAB008D5881 /* HMSlotResetCommand.m */; };
                F403893E1CAEA711002A264B /* HMMemberRequireInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F403893D1CAEA711002A264B /* HMMemberRequireInfoCommand.m */; };
                F4048A9D1E18D75E008ACFD6 /* HMDamageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048A9C1E18D75E008ACFD6 /* HMDamageView.swift */; };
+               F4048A9F1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */; };
                F40ADA021CE6317500AE29B0 /* HMIgnoreCommand.plist in Resources */ = {isa = PBXBuildFile; fileRef = F40ADA011CE6317500AE29B0 /* HMIgnoreCommand.plist */; };
                F4131ECF190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ECE190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.m */; };
                F4131ED5190F63D8004F7F9A /* HMUpdateSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ED4190F63D8004F7F9A /* HMUpdateSlotItemCommand.m */; };
                F495462E1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F495462C1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld */; };
                F49546311B18991300E0D8D0 /* HMBookmarkDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F49546301B18991300E0D8D0 /* HMBookmarkDataStore.m */; };
                F49688671B3EA16800D3CEDE /* RemoveDatabaseFileAndRestart.app in Resources */ = {isa = PBXBuildFile; fileRef = F49688661B3EA16800D3CEDE /* RemoveDatabaseFileAndRestart.app */; };
-               F49828FC1902A226000D6BBE /* HMStrokeTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */; };
                F499E8901B5D4E7F00189029 /* HMPortNotifyCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F499E88F1B5D4E7F00189029 /* HMPortNotifyCommand.m */; };
                F49AABE61DFC48F300E0B24F /* MainTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F49AABE51DFC48F300E0B24F /* MainTouchBar.xib */; };
                F49AABE81DFD33FB00E0B24F /* HistoryWindowTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F49AABE71DFD33FB00E0B24F /* HistoryWindowTouchBar.xib */; };
                F403893C1CAEA711002A264B /* HMMemberRequireInfoCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberRequireInfoCommand.h; sourceTree = "<group>"; };
                F403893D1CAEA711002A264B /* HMMemberRequireInfoCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberRequireInfoCommand.m; sourceTree = "<group>"; };
                F4048A9C1E18D75E008ACFD6 /* HMDamageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMDamageView.swift; sourceTree = "<group>"; };
+               F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMStrokeTextFieldCell.swift; sourceTree = "<group>"; };
                F40ADA011CE6317500AE29B0 /* HMIgnoreCommand.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HMIgnoreCommand.plist; sourceTree = "<group>"; };
                F4131ECD190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMStoreCreateSlotItemHistoryCommand.h; sourceTree = "<group>"; };
                F4131ECE190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMStoreCreateSlotItemHistoryCommand.m; sourceTree = "<group>"; };
                F497F63D1D5B7CE600A8F609 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
                F497F63E1D5B7CE600A8F609 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/SlotItemShortName.plist"; sourceTree = "<group>"; };
                F497F63F1D5B7CE700A8F609 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Taihi.txt"; sourceTree = "<group>"; };
-               F49828FA1902A226000D6BBE /* HMStrokeTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMStrokeTextFieldCell.h; sourceTree = "<group>"; };
-               F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMStrokeTextFieldCell.m; sourceTree = "<group>"; };
                F499E88E1B5D4E7F00189029 /* HMPortNotifyCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPortNotifyCommand.h; sourceTree = "<group>"; };
                F499E88F1B5D4E7F00189029 /* HMPortNotifyCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPortNotifyCommand.m; sourceTree = "<group>"; };
                F49AABE51DFC48F300E0B24F /* MainTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainTouchBar.xib; sourceTree = "<group>"; };
                                F4B1E30419C73B6A00805879 /* HMSuppliesCell.m */,
                                F4B1E30519C73B6A00805879 /* HMSuppliesView.h */,
                                F4B1E30619C73B6A00805879 /* HMSuppliesView.m */,
-                               F49828FA1902A226000D6BBE /* HMStrokeTextFieldCell.h */,
-                               F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */,
+                               F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */,
                                F4048A9C1E18D75E008ACFD6 /* HMDamageView.swift */,
                        );
                        name = MainWindow;
                                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */,
                                F4F9F87E1C6B5E4A00D0EE76 /* HMKCMasterSType.m in Sources */,
                                F431E9791DF3CD1B00FB56AE /* HMActinKindTransformer.m in Sources */,
+                               F4048A9F1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift in Sources */,
                                F45F3BE11E067A870009434E /* HMHistoryItemCleaner.swift in Sources */,
                                F4E5FF0C1E1645280026868C /* HMScreenshotListViewController.swift in Sources */,
                                F426802B194D0F4800B2C27F /* HMMemberShip2Command.m in Sources */,
                                F424A7001BC8C10C0096C431 /* HMFailedCommand.m in Sources */,
                                F49546261B1355EC00E0D8D0 /* HMBookmarkItem.m in Sources */,
                                F4AC13711E096A7B00851147 /* HMHistoryWindowController.swift in Sources */,
-                               F49828FC1902A226000D6BBE /* HMStrokeTextFieldCell.m in Sources */,
                                F43769D61ADE86B200DE6204 /* HMQuestListCommand.m in Sources */,
                                F4A3AD8B19B9BE7A00FDBF80 /* HMMaskSelectView.m in Sources */,
                                F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */,
index e43e66c..e6c3c2a 100644 (file)
@@ -49,7 +49,7 @@
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="5Ds-eT-IIh">
                         <rect key="frame" x="75" y="20" width="61" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123/123" id="b4R-If-THa" customClass="HMStrokeTextFieldCell">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123/123" id="b4R-If-THa">
                             <font key="font" size="13" name="Helvetica"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -74,7 +74,7 @@
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qit-fF-dVl">
                         <rect key="frame" x="144" y="39" width="27" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="100" id="FwR-YA-3mt" customClass="HMStrokeTextFieldCell">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="100" id="FwR-YA-3mt">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -96,7 +96,7 @@
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="mVa-FL-Y5P">
                         <rect key="frame" x="0.0" y="39" width="13" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="6" id="RCw-nV-l2W" customClass="HMStrokeTextFieldCell">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="6" id="RCw-nV-l2W">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
index 09f036a..491b02a 100644 (file)
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMResourceViewController">
             <rect key="frame" x="0.0" y="0.0" width="352" height="103"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <box verticalHuggingPriority="750" fixedFrame="YES" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="TAs-Z0-HON">
+                <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="TAs-Z0-HON">
                     <rect key="frame" x="11" y="69" width="329" height="5"/>
-                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <font key="titleFont" metaFont="system"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pbz-zc-m0a">
                     <rect key="frame" x="18" y="47" width="30" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="油:" id="OOc-p2-nak">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -53,6 +54,7 @@
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jSq-lq-r2A">
                     <rect key="frame" x="47" y="48" width="58" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="khk-Fx-0Sr">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -65,6 +67,7 @@
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0jI-DX-wvy">
                     <rect key="frame" x="18" y="24" width="30" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="弾:" id="caa-Yt-7sH">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -73,6 +76,7 @@
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hh9-mi-7o3">
                     <rect key="frame" x="47" y="25" width="58" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="UgO-e7-NJX">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -85,6 +89,7 @@
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2uq-H5-eb3">
                     <rect key="frame" x="108" y="48" width="56" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="鉄:" id="bbs-3r-2PL">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -93,6 +98,7 @@
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Buq-Ef-oiE">
                     <rect key="frame" x="163" y="48" width="58" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="DnK-h9-LLL">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fzi-8b-HJJ">
                     <rect key="frame" x="108" y="25" width="56" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="ボーキ:" id="xhk-Fw-2Re">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpL-F2-tIB">
                     <rect key="frame" x="163" y="25" width="58" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="Dgx-b3-zYf">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wF0-59-deC">
                     <rect key="frame" x="108" y="2" width="56" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="バケツ:" id="Psw-z9-CyC">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jIF-Vx-Ore">
                     <rect key="frame" x="163" y="2" width="50" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="12,345" id="eSg-2O-mMP">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EVm-HL-pIG">
                     <rect key="frame" x="224" y="25" width="69" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="改修資材:" id="bp4-7X-Y4C">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cDs-nw-aC8">
                     <rect key="frame" x="292" y="26" width="41" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="Dmc-L8-eZV">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NRa-hf-lX4">
                     <rect key="frame" x="224" y="2" width="69" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="バーナー:" id="MaZ-rV-nig">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Yo-zp-asa">
                     <rect key="frame" x="292" y="2" width="41" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="iBB-VR-fGg">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hxY-LT-yej">
                     <rect key="frame" x="292" y="48" width="41" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="UGX-sj-Mct">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="icZ-Y6-wZC">
                     <rect key="frame" x="224" y="48" width="69" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="開発:" id="cMZ-qY-TLr">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3LS-D9-NHl">
                     <rect key="frame" x="104" y="80" width="51" height="17"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="999/999" id="q8P-vC-JIx" customClass="HMStrokeTextFieldCell">
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="999/999" id="q8P-vC-JIx" customClass="HMStrokeTextFieldCell" customModule="KCD">
                         <font key="font" size="13" name="Helvetica"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6bF-9E-LIx">
                     <rect key="frame" x="13" y="80" width="95" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="艦娘入居状況:" id="Mjc-VP-2DY">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Lj-Yk-pkb">
                     <rect key="frame" x="255" y="80" width="81" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1999/1999+3" id="y6E-Nb-6oy">
                         <font key="font" size="13" name="Helvetica"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Iui-TE-Dcw">
                     <rect key="frame" x="190" y="80" width="69" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="倉庫状況:" id="An9-yO-CCk">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ssb-eY-F4t">
                     <rect key="frame" x="167" y="76" width="15" height="22"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="9" id="snU-3a-0HH"/>
                     <connections>
                         <binding destination="-2" name="value" keyPath="minimumColoredShipCount" id="5Jg-wN-va8"/>
                 </stepper>
                 <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JGC-t2-usB">
                     <rect key="frame" x="156" y="78" width="15" height="19"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" alignment="right" title="9" drawsBackground="YES" id="69t-vj-KJ7">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="hpk-eB-Q8e"/>
                         <font key="font" metaFont="smallSystem"/>
index 1b4b0b9..f0c5433 100644 (file)
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ugl-Cj-bSp">
                         <rect key="frame" x="172" y="107" width="61" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="999/999" id="YS8-Um-wf7" customClass="HMStrokeTextFieldCell">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="999/999" id="YS8-Um-wf7">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/KCD/HMStrokeTextFieldCell.h b/KCD/HMStrokeTextFieldCell.h
deleted file mode 100644 (file)
index d7f8e93..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMStrokeTextFieldCell.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/19.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface HMStrokeTextFieldCell : NSTextFieldCell
-
-@end
diff --git a/KCD/HMStrokeTextFieldCell.m b/KCD/HMStrokeTextFieldCell.m
deleted file mode 100644 (file)
index cb8d1dd..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//  HMStrokeTextFieldCell.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/19.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMStrokeTextFieldCell.h"
-
-const CGFloat boarderWidth = 2.0;
-
-@interface HMStrokeTextFieldCell ()
-@property (nonatomic, strong) NSLayoutManager *layoutManager;
-@property (nonatomic, strong) NSTextContainer *textContainer;
-@end
-
-@implementation HMStrokeTextFieldCell
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-       self = [super initWithCoder:aDecoder];
-       if(self) {
-               _layoutManager = [NSLayoutManager new];
-               _textContainer = [NSTextContainer new];
-               [self.layoutManager addTextContainer:self.textContainer];
-       }
-       return self;
-}
-
-- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
-       NSAttributedString *attributedString = self.attributedStringValue;
-       NSDictionary *attribute = [attributedString attributesAtIndex:0 effectiveRange:NULL];
-       NSColor *forgroundColor = [attribute objectForKey:NSForegroundColorAttributeName];
-       if(!forgroundColor) return;
-       if([forgroundColor isEqual:[NSColor controlTextColor]]) {
-               [super drawInteriorWithFrame:cellFrame inView:controlView];
-               return;
-       }
-
-       NSTextStorage *textStorage = [[NSTextStorage alloc] initWithString:attributedString.string attributes:attribute];
-       [textStorage addLayoutManager:self.layoutManager];
-       
-       NSRange range = [self.layoutManager glyphRangeForTextContainer:self.textContainer];
-       CGGlyph glyph[range.length];
-       NSUInteger glyphLength = [self.layoutManager getGlyphsInRange:range
-                                                                                                                  glyphs:glyph
-                                                                                                          properties:NULL
-                                                                                                characterIndexes:NULL
-                                                                                                          bidiLevels:NULL];
-       
-       NSFont *font = [attribute objectForKey:NSFontAttributeName];
-       NSPoint point = {boarderWidth,0};
-       point.y -= [font descender];
-       if([controlView isFlipped]) {
-               point.y -= [controlView frame].size.height;
-       }
-       
-       NSGlyph nsGlyph[range.length];
-       for(int i = 0; i < range.length; i++) {
-               nsGlyph[i] = glyph[i];
-       }
-       
-       NSBezierPath *path = [NSBezierPath new];
-       [path moveToPoint:point];
-       [path appendBezierPathWithGlyphs:nsGlyph count:glyphLength inFont:font];
-       [path setLineWidth:boarderWidth];
-       [path setLineJoinStyle:NSRoundLineJoinStyle];
-       if([controlView isFlipped]) {
-               NSAffineTransform *affineTransform = [NSAffineTransform transform];
-               [affineTransform scaleXBy:1 yBy:-1];
-               [path transformUsingAffineTransform:affineTransform];
-       }
-       
-       [[NSColor blackColor] set];
-       [path stroke];
-       
-       [forgroundColor set];
-       [path fill];
-       
-}
-@end
diff --git a/KCD/HMStrokeTextFieldCell.swift b/KCD/HMStrokeTextFieldCell.swift
new file mode 100644 (file)
index 0000000..81619bf
--- /dev/null
@@ -0,0 +1,66 @@
+//
+//  HMStrokeTextFieldCell.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/01.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMStrokeTextFieldCell: NSTextFieldCell {
+    
+    required init(coder: NSCoder) {
+        layoutManager = NSLayoutManager()
+        textContainer = NSTextContainer()
+        super.init(coder: coder)
+        layoutManager.addTextContainer(textContainer)
+    }
+    
+    private static let boarderWidth: CGFloat = 2.0
+    
+    private let layoutManager: NSLayoutManager
+    private let textContainer: NSTextContainer
+    
+    override func drawInterior(withFrame cellFrame: NSRect, in controlView: NSView) {
+        let attributedString = attributedStringValue
+        let attribute = attributedString.attributes(at: 0, effectiveRange: nil)
+        guard let forgroundColor = attribute[NSForegroundColorAttributeName] as? NSColor else { return }
+        if forgroundColor == NSColor.controlTextColor {
+            super.drawInterior(withFrame: cellFrame, in: controlView)
+            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)
+        var point = NSMakePoint(HMStrokeTextFieldCell.boarderWidth, 0)
+        point.y -= font.descender
+        if controlView.isFlipped {
+            point.y -= NSHeight(controlView.frame)
+        }
+        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)
+        path.lineWidth = HMStrokeTextFieldCell.boarderWidth
+        path.lineJoinStyle = .roundLineJoinStyle
+        if controlView.isFlipped {
+            var affineTransform = AffineTransform()
+            affineTransform.scale(x: 1, y: -1)
+            path.transform(using: affineTransform)
+        }
+        
+        NSColor.black.set()
+        path.stroke()
+        forgroundColor.set()
+        path.fill()
+    }
+}