diff --git a/app/qml/BooksBookView.qml b/app/qml/BooksBookView.qml index a390bc1..05f54c6 100644 --- a/app/qml/BooksBookView.qml +++ b/app/qml/BooksBookView.qml @@ -68,7 +68,8 @@ SilicaFlickable { (!imageView || !imageView.visible) && (!footnoteView || !footnoteView.visible) - readonly property bool viewActive: Qt.application.active && book + property bool pageActive + readonly property bool viewActive: pageActive && Qt.application.active && book readonly property bool haveVolumeUpAction: Settings.volumeUpAction !== BooksSettings.ActionNone readonly property bool haveVolumeDownAction: Settings.volumeDownAction !== BooksSettings.ActionNone readonly property bool haveKeyAction: haveVolumeUpAction || haveVolumeDownAction diff --git a/app/qml/BooksMainPage.qml b/app/qml/BooksMainPage.qml index 7cbc9bb..f1614db 100644 --- a/app/qml/BooksMainPage.qml +++ b/app/qml/BooksMainPage.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2015-2016 Jolla Ltd. - Contact: Slava Monich + Copyright (C) 2015-2020 Jolla Ltd. + Copyright (C) 2015-2020 Slava Monich You may use this file under the terms of BSD license as follows: @@ -8,14 +8,15 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of Jolla Ltd nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + 3. Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -62,6 +63,7 @@ Page { opacity: book ? 1 : 0 visible: opacity > 0 orientation: root.orientation + pageActive: root.status === PageStatus.Active book: Settings.currentBook ? Settings.currentBook : null onCloseBook: Settings.currentBook = null Behavior on opacity { FadeAnimation {} }