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

Pre Merge pull request !85 from ShikiSuen/upd/1.9.3sp2

This commit is contained in:
ShikiSuen 2022-08-15 12:55:55 +00:00 committed by Gitee
parent 89b39deedd 5c21d96caf
commit ac66d93baa
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift
View File

@ -83,12 +83,9 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol {
} }
public func reloadData() { public func reloadData() {
guard let delegate = delegate else { return } // guard let delegate = delegate else { return } // 下文無效，所以這句沒用。
let candidates = delegate.candidatesForController(self).map { theCandidate -> String in // 既然下述函式無效，那中間這段沒用的也都砍了。
let theConverted = IME.kanjiConversionIfRequired(theCandidate.1) // setCandidateData(candidates) // 該函式無效。
return (theCandidate.1 == theConverted) ? theCandidate.1 : "\(theConverted)(\(theCandidate.1))"
}
setCandidateData(candidates)
keyCount = selectionKeys().count keyCount = selectionKeys().count
selectedCandidateIndex = 0 selectedCandidateIndex = 0
update() update()

4
Source/Modules/UIModules/CandidateUI/ctlCandidateUniversal.swift
View File

@ -88,8 +88,8 @@ private class vwrCandidateUniversal: NSView {
calculatedWindowWidth = rctCandidate.size.width + cellPadding * 2 calculatedWindowWidth = rctCandidate.size.width + cellPadding * 2
} }
case false: case false:
if cellWidth < cellHeight * 1.35 { if cellWidth < cellHeight * 1.4 {
cellWidth = cellHeight * 1.35 cellWidth = cellHeight * 1.4
} }
} }
newWidths.append(round(cellWidth)) newWidths.append(round(cellWidth))