diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-09-22 15:40:01 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-09-22 15:56:58 +0200 |
| commit | d64ffa75d9a9a944c70c64d3cdab2b0d995f70c5 (patch) | |
| tree | c782fdacdcba64d09107324083dca53ac0a21f0e /qml | |
| parent | 63ed3ca072ea0fa94a6f34890413a8425a9780fb (diff) | |
Also allow going back from schedule to homescreen
Was annoying imho to always have to use the menu.
Also having the location on top left there doesn't offer
any additional information as we always have it next to
the date.
Change-Id: I6db183cde435a17a22be8452d7bb11a4fa64f327
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/components/ConferenceHeader.qml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qml/components/ConferenceHeader.qml b/qml/components/ConferenceHeader.qml index 74ec59e..b35382c 100644 --- a/qml/components/ConferenceHeader.qml +++ b/qml/components/ConferenceHeader.qml @@ -68,7 +68,8 @@ Item { anchors.fill: parent enabled: !!stack.currentItem && (stack.currentItem.objectName === "event" || stack.currentItem.objectName === "feedback" || - stack.currentItem.objectName === "floorPlan") + stack.currentItem.objectName === "floorPlan" || + stack.currentItem.objectName === "trackSwitcher") onClicked: stack.pop() Rectangle { anchors.fill: parent @@ -85,7 +86,9 @@ Item { opacity: (stack.depth > 1 && (!!stack.currentItem && (stack.currentItem.objectName === "event" || stack.currentItem.objectName === "feedback" || - stack.currentItem.objectName === "floorPlan"))) ? 1 : 0 + stack.currentItem.objectName === "floorPlan" || + stack.currentItem.objectName === "trackSwitcher" + ))) ? 1 : 0 Behavior on opacity { PropertyAnimation{} } height: Theme.sizes.backHeight width: Theme.sizes.backWidth @@ -106,6 +109,7 @@ Item { 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{} } |