Merge pull request #85 from codefirst/fix-for-highsierra

fix for HighSierra
codefirst · Sep 1, 2018 · 0901e44 · 0901e44
2 parents 2046624 + 4eeaaa5
commit 0901e44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/platform/mac/proj/AquaSKK-Info.plist b/platform/mac/proj/AquaSKK-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.0</string>
+	<string>4.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>

diff --git a/platform/mac/proj/AquaSKKPreferences-Info.plist b/platform/mac/proj/AquaSKKPreferences-Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.0</string>
+	<string>4.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2018-8-31</string>
+	<string>2018-9-1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSUIElement</key>

diff --git a/platform/mac/src/gui/CandidateCell.mm b/platform/mac/src/gui/CandidateCell.mm
@@ -68,8 +68,13 @@ - (void)setString:(NSString*)string withLabel:(char)label {
     [tmpstr release];
 
     // ラベルの背景色
-    [entry_ addAttribute:NSBackgroundColorAttributeName
-	    value:[NSColor controlAccentColor] range:NSMakeRange(0, 3)];
+    if (@available(macOS 10_14, *)) {
+      [entry_ addAttribute:NSBackgroundColorAttributeName
+        value:[NSColor controlAccentColor] range:NSMakeRange(0, 3)];
+    } else {
+      [entry_ addAttribute:NSBackgroundColorAttributeName
+        value:[NSColor selectedMenuItemColor] range:NSMakeRange(0, 3)];
+    }
 
     // ラベルの文字色
     [entry_ addAttribute:NSForegroundColorAttributeName