From f4de5d1befa6ed2634bb8e5ed2e5e02c9feb1506 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 13 May 2016 17:58:21 +0200 Subject: [PATCH] move progressbar in MainView only show on controls shown --- mobile/app/package/contents/ui/MainView.qml | 13 +++++++++++++ mobile/app/package/contents/ui/main.qml | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mobile/app/package/contents/ui/MainView.qml b/mobile/app/package/contents/ui/MainView.qml index ec791af53..8a82231c3 100644 --- a/mobile/app/package/contents/ui/MainView.qml +++ b/mobile/app/package/contents/ui/MainView.qml @@ -18,6 +18,7 @@ */ import QtQuick 2.1 +import QtQuick.Controls 1.3 import org.kde.okular 2.0 as Okular import org.kde.kirigami 1.0 as Kirigami @@ -50,4 +51,16 @@ Kirigami.Page { target: pageArea.page onBookmarkedChanged: actions.main.checked = pageArea.page.bookmarked } + ProgressBar { + id: bar + z: 99 + visible: applicationWindow().controlsVisible + height: Kirigami.Units.smallSpacing + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + value: documentItem.pageCount != 0 ? ((documentItem.currentPage+1) / documentItem.pageCount) : 0 + } } diff --git a/mobile/app/package/contents/ui/main.qml b/mobile/app/package/contents/ui/main.qml index 09410c802..e030ab14a 100644 --- a/mobile/app/package/contents/ui/main.qml +++ b/mobile/app/package/contents/ui/main.qml @@ -42,18 +42,6 @@ Kirigami.AbstractApplicationWindow { } contextDrawer: OkularDrawer {} - ProgressBar { - id: bar - z: 99 - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - height: units.smallSpacing - value: documentItem.pageCount != 0 ? (documentItem.currentPage / documentItem.pageCount) : 0 - } - Okular.DocumentItem { id: documentItem onWindowTitleForDocumentChanged: {