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

CtlCandidateTDK // Add isFilterable().

This commit is contained in:
ShikiSuen 2023-03-23 12:24:07 +08:00
parent d386a93784
commit 5a8303a45f
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool.swift
View File

@ -232,6 +232,16 @@ public extension CandidatePool {
}
return (min, nil)
}
func isFilterable(target index: Int) -> Bool {
let spanLength = candidateDataAll[index].spanLength
guard spanLength == 1 else { return true }
return cellsOf(spanLength: spanLength).count > 1
}
func cellsOf(spanLength: Int) -> [CandidateCellData] {
candidateDataAll.filter { $0.spanLength == spanLength }
}
}
// MARK: - Privates.

5
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Cocoa.swift
View File

@ -333,6 +333,7 @@ private extension VwrCandidateTDKCocoa {
var theMenu: NSMenu?
private func prepareMenu() {
guard let thePool = (target as? VwrCandidateTDKCocoa)?.thePool else { return }
let newMenu = NSMenu()
let boostMenuItem = NSMenuItem(
title: "↑ \(cellData.displayedText)",
@ -350,9 +351,7 @@ private extension VwrCandidateTDKCocoa {
nerfMenuItem.target = self
newMenu.addItem(nerfMenuItem)
if let dataAll = (target as? VwrCandidateTDKCocoa)?.thePool.candidateDataAll,
dataAll.count > cellData.index, dataAll[cellData.index].spanLength > 1
{
if thePool.isFilterable(target: cellData.index) {
let filterMenuItem = NSMenuItem(
title: "✖︎ \(cellData.displayedText)",
action: #selector(menuActionOfFiltering(_:)),

4
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_SwiftUI.swift
View File

@ -168,9 +168,7 @@ extension VwrCandidateTDK {
} label: {
Text("↓ " + cell.displayedText)
}
if thePool.candidateDataAll.count > cell.index,
thePool.candidateDataAll[cell.index].spanLength > 1
{
if thePool.isFilterable(target: cell.index) {
Button {
didRightClickCandidateAt(cell.index, action: .toFilter)
} label: {