Skip to content

Fix the keyboard handling of a radio group #360

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

Open
rezabakhshilaktasaraei wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix the keyboard handling of a radio group #360

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a5a504
Let a radio button take focus from the keyboard only
rezabakhshilaktasaraei Sep 2, 2026
18a30bb
Read the layout of a radio group in global coordinates
rezabakhshilaktasaraei Sep 2, 2026
e429781
Pass over hidden and disabled buttons with the arrows of a radio group
rezabakhshilaktasaraei Sep 3, 2026
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
33 changes: 23 additions & 10 deletions ui/widgets/checkbox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,14 +1036,14 @@ void Radiobutton::trackScreenReaderState() {
if (!screenReaderActive || !value.has_value()) {
return Qt::NoFocus;
} else if (value == _value) {
return Qt::StrongFocus;
return Qt::TabFocus;
}
for (const auto &button : _group->_buttons) {
if (button->_value == value) {
return Qt::NoFocus;
}
}
return Qt::StrongFocus;
return Qt::TabFocus;
}) | rpl::on_next([=](Qt::FocusPolicy value) {
if (focusPolicy() != value) {
setFocusPolicy(value);
Expand Down Expand Up @@ -1092,8 +1092,14 @@ void Radiobutton::keyPressEvent(QKeyEvent *e) {
? buttons[currentIndex - 1]
: buttons[currentIndex + 1];

const auto deltaY = std::abs(neighbor->y() - y());
const auto deltaX = std::abs(neighbor->x() - x());
// In global coordinates: the buttons of one group are not always
// siblings - each one may sit in a wrap of its own, like the correct
// answer buttons of a quiz - and their positions inside those parents
// say nothing about how the group is laid out on the screen.
const auto position = mapToGlobal(QPoint());
const auto neighborPosition = neighbor->mapToGlobal(QPoint());
const auto deltaY = std::abs(neighborPosition.y() - position.y());
const auto deltaX = std::abs(neighborPosition.x() - position.x());
const auto orientation = (deltaY > deltaX)
? Qt::Vertical
: Qt::Horizontal;
Expand All @@ -1105,15 +1111,22 @@ void Radiobutton::keyPressEvent(QKeyEvent *e) {
}

const auto step = (key == Qt::Key_Down || key == Qt::Key_Right) ? 1 : -1;
const auto nextIndex = currentIndex + step;

if (nextIndex >= 0 && nextIndex < buttons.size()) {
// Pass over the buttons that are hidden or disabled - the correct
// answer button of an empty quiz row is kept hidden until the row is
// filled in - or an arrow would check something that is not there.
auto nextIndex = currentIndex + step;
while (nextIndex >= 0 && nextIndex < buttons.size()) {
const auto nextButton = buttons[nextIndex];
const auto weak = base::make_weak(nextButton);
_group->setValue(nextButton->_value);
if (const auto strong = weak.get()) {
strong->setFocus(Qt::OtherFocusReason);
if (nextButton->isVisible() && nextButton->isEnabled()) {
const auto weak = base::make_weak(nextButton);
_group->setValue(nextButton->_value);
if (const auto strong = weak.get()) {
strong->setFocus(Qt::OtherFocusReason);
}
return;
}
nextIndex += step;
}
}

Expand Down