Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions ui/abstract_button.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,18 @@ void AbstractButton::clearState() {
onStateChanged(was, StateChangeSource::ByUser);
}

QString AbstractButton::accessibilityName() {
const auto custom = QWidget::accessibleName();
if (!custom.isEmpty()) {
return custom;
}
const auto tip = toolTip();
if (!tip.isEmpty()) {
return tip;
}
return QString();
}

AccessibilityState AbstractButton::accessibilityState() const {
return { .pressed = isDown() };
}
Expand Down
1 change: 1 addition & 0 deletions ui/abstract_button.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class AbstractButton : public RpWidget {
? QAccessible::ButtonMenu
: QAccessible::Button;
}
QString accessibilityName() override;
AccessibilityState accessibilityState() const override;
void accessibilityDoAction(const QString &name) override;

Expand Down
2 changes: 2 additions & 0 deletions ui/widgets/buttons.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ FlatButton::FlatButton(

void FlatButton::setText(const QString &text) {
_text = text;
setAccessibleName(text);
accessibilityNameChanged();
update();
}
Expand Down Expand Up @@ -1056,6 +1057,7 @@ void SettingsButton::onStateChanged(

void SettingsButton::setText(TextWithEntities &&text) {
_text.setMarkedText(_st.style, text, kMarkupTextOptions, _context);
setAccessibleName(_text.toString());
accessibilityNameChanged();
update();
}
Expand Down
3 changes: 3 additions & 0 deletions ui/widgets/popup_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "ui/ui_utility.h"

#include <QtGui/QtEvents>
#include <QtGui/QAccessible>
#include <QtGui/QPainter>
#include <QtGui/QScreen>
#include <QtGui/QWindow>
Expand Down Expand Up @@ -1172,6 +1173,8 @@ void PopupMenu::showPrepared(TriggeredSource source) {
activateWindow();
if (Ui::ScreenReaderModeActive()) {
_menu->setShowSource(TriggeredSource::Keyboard);
QAccessibleEvent event(this, QAccessible::Focus);
QAccessible::updateAccessibility(&event);
} else {
_menu->setShowSource(source);
}
Expand Down