diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-09-26 10:09:10 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-09-26 11:01:01 +0200 |
| commit | 37f1efb931cde08888b353fd1d93051081443f18 (patch) | |
| tree | dcd32bf58bc165b759f7505bec64e6f60313e177 /qml | |
| parent | 6dea2d0602b59f58d4b9cd49c62a32096852066d (diff) | |
Rework back / home button
Make it more consistent and intuitive:
Only Feedback and event page have back arrow as they
are logically sub pages. All other pages have the
location button that leads back to the homescreen.
Change-Id: I7c0cadb05b461032b0fb77d22c25df7a688f52dc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/components/ConferenceHeader.qml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/qml/components/ConferenceHeader.qml b/qml/components/ConferenceHeader.qml index b35382c..b79c849 100644 --- a/qml/components/ConferenceHeader.qml +++ b/qml/components/ConferenceHeader.qml @@ -67,9 +67,7 @@ Item { id: mouseAreaBack anchors.fill: parent enabled: !!stack.currentItem && (stack.currentItem.objectName === "event" || - stack.currentItem.objectName === "feedback" || - stack.currentItem.objectName === "floorPlan" || - stack.currentItem.objectName === "trackSwitcher") + stack.currentItem.objectName === "feedback") onClicked: stack.pop() Rectangle { anchors.fill: parent @@ -85,9 +83,7 @@ Item { anchors.leftMargin: Theme.margins.twenty opacity: (stack.depth > 1 && (!!stack.currentItem && (stack.currentItem.objectName === "event" || - stack.currentItem.objectName === "feedback" || - stack.currentItem.objectName === "floorPlan" || - stack.currentItem.objectName === "trackSwitcher" + stack.currentItem.objectName === "feedback" ))) ? 1 : 0 Behavior on opacity { PropertyAnimation{} } height: Theme.sizes.backHeight @@ -108,8 +104,6 @@ Item { anchors.verticalCenter: parent.verticalCenter opacity: (!!stack.currentItem && stack.currentItem.objectName !== "event" && stack.currentItem.objectName !== "feedback" && - stack.currentItem.objectName !== "floorPlan" && - stack.currentItem.objectName !== "trackSwitcher" && applicationClient.currentConferenceId !== "") ? 1 : 0 Behavior on opacity { PropertyAnimation{} } @@ -138,6 +132,15 @@ Item { } } + + MouseArea { + anchors.fill: parent + enabled: !!stack.currentItem && (stack.currentItem.objectName !== "event" && + stack.currentItem.objectName !== "feedback") + onClicked: { + stack.pop(stack.find(function(item){ return item.objectName === "homeScreen" })) + } + } } } Image { |