From 98dfc5c770a27081a9fc1d065281aaa31b67d52a Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Tue, 9 Feb 2016 20:39:31 +0100 Subject: QML UI: Back buttons for app log and theme info The app log and theme info had context menus with a single close item. No need for that. Signed-off-by: Henrik Brautaset Aronsen Signed-off-by: Dirk Hohndel --- qt-mobile/qml/TopBar.qml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'qt-mobile/qml/TopBar.qml') diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml index a2bab331e..7c6beb44b 100644 --- a/qt-mobile/qml/TopBar.qml +++ b/qt-mobile/qml/TopBar.qml @@ -87,7 +87,7 @@ Rectangle { anchors.top: parent.top Layout.preferredHeight: editButtonIcon.height width: editButtonIcon.width - visible: (detailsWindow.state === "view" && detailsWindow.visible) + visible: !backButton.visible && detailsWindow.state === "view" && detailsWindow.visible Image { id: editButtonIcon source: "qrc:/qml/menu-edit.png" @@ -121,7 +121,8 @@ Rectangle { anchors.top: parent.top Layout.preferredHeight: backButtonIcon.height width: backButtonIcon.width - visible: (detailsWindow.state === "edit" && detailsWindow.visible) + visible: logWindow.visible || themetest.visible || + (detailsWindow.state === "edit" && detailsWindow.visible) Image { id: backButtonIcon source: "qrc:/qml/menu-back.png" @@ -138,7 +139,10 @@ Rectangle { height: parent.height width: parent.width onClicked: { - detailsWindow.endEditMode() + if (logWindow.visible || themetest.visible) + stackView.pop() + else + detailsWindow.endEditMode() } } } -- cgit v1.2.3-70-g09d2