Commit 48cf70f9 authored by Karel Slaný's avatar Karel Slaný
Browse files

Merge branch 'accessible-improvements' into 'develop'

Accessibility Improvements

Closes #188

See merge request !234
parents 5fb24af0 99f044f0
......@@ -41,23 +41,6 @@ Rectangle {
height: baseHeaderHeight
color: pageHeaderBgColor
z: 1
AccessibleOverlaidImageButton {
id: backIcon
visible: !isFirstPage
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: defaultMargin
image.sourceSize.height: imageNavigateDimension
image.source: (isiOS) ? "qrc:/ui/back.svg" : "qrc:/ui/android-arrow-back.svg"
}
AccessibleText {
id: backText
visible: (isiOS && !isFirstPage)
anchors.verticalCenter: parent.verticalCenter
anchors.left: backIcon.right
color: actionIconColor
text: qsTr("Back")
}
MouseArea {
function handleClick() {
if (typeof(statusBar) != "undefined") {
......@@ -66,10 +49,10 @@ Rectangle {
backClicked()
}
visible: !isFirstPage
anchors.left: backIcon.left
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: backText.right
width: backIcon.width + backText.width + 3*defaultMargin
Accessible.role: Accessible.Button
Accessible.name: backText.text
Accessible.onPressAction: {
......@@ -78,6 +61,22 @@ Rectangle {
onClicked: {
handleClick()
}
OverlaidImage {
id: backIcon
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: defaultMargin
image.sourceSize.height: imageNavigateDimension
image.source: (isiOS) ? "qrc:/ui/back.svg" : "qrc:/ui/android-arrow-back.svg"
}
Text {
id: backText
visible: isiOS
anchors.verticalCenter: parent.verticalCenter
anchors.left: backIcon.right
color: actionIconColor
text: qsTr("Back")
}
}
AccessibleText {
anchors.centerIn: parent
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment