Skip to content

Revert "Add support for hiding candidate list via Rime option _hide_candidate" #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lotem merged 1 commit into from
Dec 21, 2025
+13 −15
Merged

Revert "Add support for hiding candidate list via Rime option _hide_candidate" #1084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions sources/SquirrelInputController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,24 +515,22 @@ private extension SquirrelInputController {
let numCandidates = Int(ctx.menu.num_candidates)
var candidates = [String]()
var comments = [String]()
for i in 0..<numCandidates {
let candidate = ctx.menu.candidates[i]
candidates.append(candidate.text.map { String(cString: $0) } ?? "")
comments.append(candidate.comment.map { String(cString: $0) } ?? "")
}
var labels = [String]()
if !rimeAPI.get_option(session, "_hide_candidate") {
for i in 0..<numCandidates {
let candidate = ctx.menu.candidates[i]
candidates.append(candidate.text.map { String(cString: $0) } ?? "")
comments.append(candidate.comment.map { String(cString: $0) } ?? "")
}
// swiftlint:disable identifier_name
if let select_keys = ctx.menu.select_keys {
labels = String(cString: select_keys).map { String($0) }
} else if let select_labels = ctx.select_labels {
let pageSize = Int(ctx.menu.page_size)
for i in 0..<pageSize {
labels.append(select_labels[i].map { String(cString: $0) } ?? "")
}
// swiftlint:disable identifier_name
if let select_keys = ctx.menu.select_keys {
labels = String(cString: select_keys).map { String($0) }
} else if let select_labels = ctx.select_labels {
let pageSize = Int(ctx.menu.page_size)
for i in 0..<pageSize {
labels.append(select_labels[i].map { String(cString: $0) } ?? "")
}
// swiftlint:enable identifier_name
}
// swiftlint:enable identifier_name
let page = Int(ctx.menu.page_no)
let lastPage = ctx.menu.is_last_page

Expand Down