diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-09-17 18:27:23 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-09-18 10:20:55 +0200 |
| commit | a1cee9142a981264d2d5aa8e3697772aa41f9e53 (patch) | |
| tree | e3889ee9761fc071a93dd4ddb86cedbcb5a14627 /qml | |
| parent | a95abd9c5b298048b92015ed0dc88b64412749f8 (diff) | |
Enable the back button from the feedback view
So the user can quit the feedback easily and go back to the
visited event without submitting a feedback.
Change-Id: I38e502fff2a4d513da164a2d042011268036bd1e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/components/ConferenceHeader.qml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qml/components/ConferenceHeader.qml b/qml/components/ConferenceHeader.qml index a982bd5..05a0871 100644 --- a/qml/components/ConferenceHeader.qml +++ b/qml/components/ConferenceHeader.qml @@ -66,7 +66,7 @@ Item { MouseArea { id: mouseAreaBack anchors.fill: parent - enabled: !!stack.currentItem && stack.currentItem.objectName === "event" + enabled: !!stack.currentItem && (stack.currentItem.objectName === "event" || stack.currentItem.objectName === "feedback") onClicked: stack.pop() Rectangle { anchors.fill: parent @@ -80,7 +80,8 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: Theme.margins.twenty - opacity: (stack.depth > 1 && (!!stack.currentItem && stack.currentItem.objectName === "event")) ? 1 : 0 + opacity: (stack.depth > 1 && (!!stack.currentItem && + (stack.currentItem.objectName === "event" || stack.currentItem.objectName === "feedback"))) ? 1 : 0 Behavior on opacity { PropertyAnimation{} } height: Theme.sizes.backHeight width: Theme.sizes.backWidth @@ -98,7 +99,8 @@ Item { id: locationButton anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - opacity: (!!stack.currentItem && stack.currentItem.objectName !== "event" && applicationClient.currentConferenceId !== "") ? 1 : 0 + opacity: (!!stack.currentItem && stack.currentItem.objectName !== "event" && stack.currentItem.objectName !== "feedback" && + applicationClient.currentConferenceId !== "") ? 1 : 0 Behavior on opacity { PropertyAnimation{} } Image { |