From afc12cade68af304853bcc8a364dbcffe1fd3658 Mon Sep 17 00:00:00 2001 From: Peter Jonas Date: Thu, 19 Aug 2021 08:06:46 +0200 Subject: [PATCH] Fix #312625 Accessibility: Speak notehead group type Implement screen reader speech output for when a note has a non-default notehead shape (group type) such as cross, triangle, diamond, etc. Backport of #8877, part 2, resp. duplicate of #7870, part 5 --- libmscore/note.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libmscore/note.cpp b/libmscore/note.cpp index 10c1cd8a96730..a5e542c461e79 100644 --- a/libmscore/note.cpp +++ b/libmscore/note.cpp @@ -3092,7 +3092,9 @@ QString Note::screenReaderInfo() const else if (staff()->isTabStaff(tick())) pitchName = QObject::tr("%1; String: %2; Fret: %3").arg(tpcUserName(true), QString::number(string() + 1), QString::number(fret())); else - pitchName = tpcUserName(true); + pitchName = _headGroup == NoteHead::Group::HEAD_NORMAL + ? tpcUserName(true) + : QObject::tr("%1 head %2").arg(subtypeName()).arg(tpcUserName(true)); return QString("%1 %2 %3%4").arg(noteTypeUserName(), pitchName, duration, (chord()->isGrace() ? "" : QString("; %1").arg(voice))); }