InputHandler // Tweak generatePunctuationNamePrefix().

This commit is contained in:
ShikiSuen 2023-03-01 14:41:31 +08:00
parent f7dc87fd7d
commit 2fc8dbe541
1 changed files with 9 additions and 4 deletions

View File

@ -517,12 +517,17 @@ public class InputHandler: InputHandlerProtocol {
/// - Returns: /// - Returns:
func generatePunctuationNamePrefix(withKeyCondition input: InputSignalProtocol) -> String { func generatePunctuationNamePrefix(withKeyCondition input: InputSignalProtocol) -> String {
if prefs.halfWidthPunctuationEnabled { return "_half_punctuation_" } if prefs.halfWidthPunctuationEnabled { return "_half_punctuation_" }
// SHIFT+ALT+
// input.isMainAreaNumKey Shift
if input.isMainAreaNumKey, input.modifierFlags == [.option, .shift] { return "_shift_alt_punctuation_" }
var result = ""
switch (input.isControlHold, input.isOptionHold) { switch (input.isControlHold, input.isOptionHold) {
case (true, true): return "_alt_ctrl_punctuation_" case (true, true): result.append("_alt_ctrl_punctuation_")
case (true, false): return "_ctrl_punctuation_" case (true, false): result.append("_ctrl_punctuation_")
case (false, true): return "_alt_punctuation_" case (false, true): result.append("_alt_punctuation_")
case (false, false): return "_punctuation_" case (false, false): result.append("_punctuation_")
} }
return result
} }
} }