Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ private extension EventLegendResolver {

// MARK: - Layout Translation
private extension EventLegendResolver {
// The legend printed on the physical key, cased for a modified chord.
// The legend printed on the physical key, which is uppercase on a real
// keyboard whether or not a modifier is held.
func translatedKey(_ keystroke: StandardKeyEvent) -> String {
let translated = self.uchrData.translatedKeyCode(keystroke.keyCode)
return keystroke.isModified ? Self.legendCased(translated) : translated
Self.legendCased(self.uchrData.translatedKeyCode(keystroke.keyCode))
}

// Uppercases a legend only when the result keeps its length.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ extension EventLegendResolverStandardKeyEventTests {
}
}

/// A digit has no distinct uppercase form, so only letters show the casing rule.
func testLetterTextIsUppercasedOnlyWhenModified() {
for (modifiers, kinds, name) in Self.allModifierCombinations {
/// A legend is the label printed on the key, which is uppercase whether or
/// not a modifier is held.
func testLetterTextIsAlwaysUppercased() {
for (modifiers, _, name) in Self.allModifierCombinations {
let legend = self.legend(.stub(keyCode: .a, modifiers: modifiers))

XCTAssertEqual(legend.text, kinds.isEmpty ? "a" : "A", "for \(name)")
XCTAssertEqual(legend.text, "A", "for \(name)")
XCTAssertEqual(legend.kind, .text, "for \(name)")
}
}
Expand Down
Loading