Skip to content

Handle candidate keys correctly in the NumberInput #237

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
zonble merged 1 commit into from
Dec 19, 2025
Merged

Handle candidate keys correctly in the NumberInput #237

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion src/KeyHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,12 +1125,18 @@ bool KeyHandler::handleNumberInput(Key key,
std::make_unique<InputStates::NumberInput>(newNumber, candidates);
stateCallback(std::move(newState));
return true;
} else if (!state->candidates.empty()) {
// If the candidate panel is visible, let it handle the key.
return false;
} else if (std::isprint(key.ascii)) {
// Reject all other printable, non-numeric keys.
errorCallback();
return true;
}

return false;
// If the buffer is empty, all other keys (e.g. cursor keys) exit the state.
stateCallback(std::make_unique<InputStates::EmptyIgnoringPrevious>());
return true;
}

bool KeyHandler::handleBig5(Key key, McBopomofo::InputStates::Big5* state,
Expand Down
7 changes: 0 additions & 7 deletions src/McBopomofo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,13 +716,6 @@ void McBopomofoEngine::keyEvent(const fcitx::InputMethodEntry& /*unused*/,
keyEvent.filterAndAccept();
return;
}
InputStates::NumberInput* currentNumberInput =
Copy link
Collaborator Author

@lukhnos lukhnos Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition will never be true, since the key can only be unhandled if there are candidates in the NumberInput state.

Copy link
Collaborator Author

@lukhnos lukhnos Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I meant to put this on line 722, but put in on 719 instead.)

dynamic_cast<InputStates::NumberInput*>(state_.get());
if (currentNumberInput != nullptr) {
if (currentNumberInput->candidates.empty()) {
return;
}
}
}

if (dynamic_cast<InputStates::ChoosingCandidate*>(state_.get()) != nullptr ||
Expand Down