Merge pull request #218 from mtgto/customized-keybindings

キーバインド設定でカスタマイズされたものを太字で表示する
mtgto · Sep 29, 2024 · ea8d40a · ea8d40a
2 parents 70096a1 + e7cd064
commit ea8d40a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/macSKK/KeyBinding.swift b/macSKK/KeyBinding.swift
@@ -354,4 +354,9 @@ struct KeyBinding: Identifiable, Hashable {
             }
         }
     }
+
+    // デフォルトのキーバインディングと同じキー入力かどうかを返す
+    var isDefault: Bool {
+        inputs == Self.defaultKeyBindingSettings.first(where: { $0.action == action })?.inputs
+    }
 }
diff --git a/macSKK/Settings/KeyBinding/KeyBindingView.swift b/macSKK/Settings/KeyBinding/KeyBindingView.swift
@@ -66,7 +66,9 @@ struct KeyBindingView: View {
         }
         Form {
             Table(settingsViewModel.selectedKeyBindingSet.values, selection: $selectingKeyBindingAction) {
-                TableColumn("Action", value: \.action.localizedAction)
+                TableColumn("Action") { keyBinding in
+                    Text(keyBinding.action.localizedAction).fontWeight(keyBinding.isDefault ? nil : .bold)
+                }
                 TableColumn("Key", value: \.localizedInputs)
             }
             .contextMenu(forSelectionType: KeyBinding.ID.self) { keyBindingActions in

diff --git a/macSKKTests/KeyBindingTests.swift b/macSKKTests/KeyBindingTests.swift
@@ -90,4 +90,11 @@ final class KeyBindingTests: XCTestCase {
         XCTAssertTrue(inputEnter.accepts(event: eventOptionEnter))
         XCTAssertFalse(inputEnter.accepts(event: eventLeft))
     }
+
+    func testIsDefault() {
+        XCTAssertFalse(KeyBinding(.toggleKana, []).isDefault)
+        XCTAssertTrue(KeyBinding(.toggleKana, [KeyBinding.Input(key: .character("q"), modifierFlags: [])]).isDefault)
+        XCTAssertFalse(KeyBinding(.toggleKana, [KeyBinding.Input(key: .character("q"), modifierFlags: [.shift])]).isDefault)
+        XCTAssertFalse(KeyBinding(.toggleKana, [KeyBinding.Input(key: .character("l"), modifierFlags: [])]).isDefault)
+    }
 }