floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repo // "allowedMarkRange" -> "allowedMarkLengthRange".

This commit is contained in:
ShikiSuen 2022-09-09 17:05:43 +08:00
parent e31b82e82b
commit 494bca4950
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Modules/ControllerModules/IMEStateData.swift
View File

@ -76,7 +76,7 @@ public struct StateData {
] ]
) )
var isFilterable: Bool { var isFilterable: Bool {
markedTargetExists ? mgrPrefs.allowedMarkRange.contains(markedRange.count) : false markedTargetExists ? mgrPrefs.allowedMarkLengthRange.contains(markedRange.count) : false
} }
var attributedStringNormal: NSAttributedString { var attributedStringNormal: NSAttributedString {
@ -197,19 +197,19 @@ extension StateData {
} }
let text = data.displayedText.charComponents[data.markedRange].joined() let text = data.displayedText.charComponents[data.markedRange].joined()
if data.markedRange.count < mgrPrefs.allowedMarkRange.lowerBound { if data.markedRange.count < mgrPrefs.allowedMarkLengthRange.lowerBound {
ctlInputMethod.tooltipInstance.setColor(state: .denialInsufficiency) ctlInputMethod.tooltipInstance.setColor(state: .denialInsufficiency)
return String( return String(
format: NSLocalizedString( format: NSLocalizedString(
"\"%@\" length must ≥ 2 for a user phrase.", comment: "" "\"%@\" length must ≥ 2 for a user phrase.", comment: ""
) + "\n◆ " + generateReadingThread(data), text ) + "\n◆ " + generateReadingThread(data), text
) )
} else if data.markedRange.count > mgrPrefs.allowedMarkRange.upperBound { } else if data.markedRange.count > mgrPrefs.allowedMarkLengthRange.upperBound {
ctlInputMethod.tooltipInstance.setColor(state: .denialOverflow) ctlInputMethod.tooltipInstance.setColor(state: .denialOverflow)
return String( return String(
format: NSLocalizedString( format: NSLocalizedString(
"\"%@\" length should ≤ %d for a user phrase.", comment: "" "\"%@\" length should ≤ %d for a user phrase.", comment: ""
) + "\n◆ " + generateReadingThread(data), text, mgrPrefs.allowedMarkRange.upperBound ) + "\n◆ " + generateReadingThread(data), text, mgrPrefs.allowedMarkLengthRange.upperBound
) )
} }

2
Source/Modules/IMEModules/mgrPrefs.swift
View File

@ -459,7 +459,7 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kMaxCandidateLength.rawValue, defaultValue: 10) @UserDefault(key: UserDef.kMaxCandidateLength.rawValue, defaultValue: 10)
static var maxCandidateLength: Int static var maxCandidateLength: Int
static var allowedMarkRange: ClosedRange<Int> = mgrPrefs.minCandidateLength...mgrPrefs.maxCandidateLength static var allowedMarkLengthRange: ClosedRange<Int> = mgrPrefs.minCandidateLength...mgrPrefs.maxCandidateLength
@UserDefault(key: UserDef.kShouldNotFartInLieuOfBeep.rawValue, defaultValue: true) @UserDefault(key: UserDef.kShouldNotFartInLieuOfBeep.rawValue, defaultValue: true)
static var shouldNotFartInLieuOfBeep: Bool static var shouldNotFartInLieuOfBeep: Bool