Skip to content

Commit

Permalink
Screen readers: Say accessible info and message together +collect_art…
Browse files Browse the repository at this point in the history
…ifacts

Previously the screen reader would say either 'accessibleMessage' or
'accessibleInfo', with priority given to 'accessibleMessage'. Now it
will say both strings if they are both are non-empty.
  • Loading branch information
shoogle committed Jun 15, 2020
1 parent 5f38b3b commit 12bd659
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mscore/scoreaccessibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,13 @@ QString AccessibleScoreView::text(QAccessible::Text t) const
case QAccessible::Value:
case QAccessible::Description: {
QString msg = s->score()->accessibleMessage();
QString info = s->score()->accessibleInfo();
if (msg.isEmpty())
return s->score()->accessibleInfo();
return info;
s->score()->setAccessibleMessage(""); // clear the message
return msg;
if (info.isEmpty())
return msg;
return tr("%1, %2").arg(msg).arg(info);
}
default:
return QString();
Expand Down

0 comments on commit 12bd659

Please sign in to comment.