Skip to content

fix: scroll mode resets on keyup #188

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
merged 1 commit into from
Sep 10, 2024
Merged

fix: scroll mode resets on keyup #188

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
21 changes: 17 additions & 4 deletions webpanel/webpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,20 @@ WebPanel::WebPanel(Instance *instance)
EventType::InputContextKeyEvent, EventWatcherPhase::PreInputMethod,
[this](Event &event) {
auto &keyEvent = static_cast<KeyEvent &>(event);
if (keyEvent.isRelease()) {
return;
}
if (keyEvent.key().checkKeyList(*config_.advanced->copyHtml)) {
if (keyEvent.isRelease()) {
return;
}
static_cast<candidate_window::WebviewCandidateWindow *>(
window_.get())
->copy_html();
return keyEvent.filterAndAccept();
}
if (scrollState_ == candidate_window::scroll_state_t::ready &&
keyEvent.key().checkKeyList(*config_.scrollMode->expand)) {
if (keyEvent.isRelease()) {
return;
}
expand();
return keyEvent.filterAndAccept();
}
Expand All @@ -176,6 +179,9 @@ WebPanel::WebPanel(Instance *instance)
};
for (const auto &pair : selectMap) {
if (keyEvent.key().check(pair.first)) {
if (keyEvent.isRelease()) {
return;
}
window_->scroll_key_action(pair.second);
return keyEvent.filterAndAccept();
}
Expand Down Expand Up @@ -204,12 +210,19 @@ WebPanel::WebPanel(Instance *instance)
}; // Can't be static because config could be modified.
for (const auto &pair : actionMap) {
if (keyEvent.key().checkKeyList(*pair.first)) {
window_->scroll_key_action(pair.second);
if (!keyEvent.isRelease()) {
window_->scroll_key_action(pair.second);
}
// Must not send release event to engine, which resets
// scroll mode.
return keyEvent.filterAndAccept();
}
}
if (keyEvent.key().checkKeyList(
*config_.scrollMode->collapse)) {
if (keyEvent.isRelease()) {
return;
}
collapse();
return keyEvent.filterAndAccept();
}
Expand Down