Skip to content

Commit d99257e

Browse files
committed
VPN-7459 part 2: iOS VoiceOver improvements
1 parent 441bbb4 commit d99257e

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

nebula/ui/components/MZLinkButton.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ MZButtonBase {
138138
font.family: fontName
139139
wrapMode: Text.WordWrap
140140
opacity: loaderVisible ? 0 : 1
141-
Accessible.ignored: !visible
141+
// on iOS, without this the item is read twice - once as a button, once as a label
142+
Accessible.ignored: !visible || Qt.platform.os === "ios"
142143
Behavior on color {
143144
ColorAnimation {
144145
duration: 200

nebula/ui/components/MZSettingsItem.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ MZClickableRow {
5151
MZBoldLabel {
5252
id: title
5353
text: settingTitle
54+
Accessible.ignored: true
5455
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
5556
verticalAlignment: Text.AlignVCenter
5657
horizontalAlignment: Text.AlignLeft

nebula/ui/components/MZViewBase.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Item {
2020
property alias _interactive: vpnFlickable.interactive
2121
property alias _contentHeight: vpnFlickable.contentHeight
2222

23-
Accessible.name: (_menuTitle.length > 0) ? _menuTitle : _accessibleName
23+
// This adds an element on iOS that we don't want read by VoiceOver.
24+
Accessible.name: Qt.platform.os === "ios" ? "" : ((_menuTitle.length > 0) ? _menuTitle : _accessibleName)
2425
Accessible.role: Accessible.Pane
2526

2627
anchors {

nebula/ui/components/navigationBar/MZBottomNavigationBar.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Rectangle {
8383
enabled: root.visible
8484

8585
checked: buttonItem.checked
86+
Accessible.selected: buttonItem.checked
8687
}
8788
}
8889
}

0 commit comments

Comments
 (0)