medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[app] Release media keys when book page is inactive

Browse source 
E.g. when settings page is open on top of it.
This commit is contained in:
Slava Monich 2020-10-22 04:13:25 +03:00
parent cfa9a1ad79
commit ca6f60132c
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/qml/BooksBookView.qml
View file

@ -68,7 +68,8 @@ SilicaFlickable {
(!imageView || !imageView.visible) && (!imageView || !imageView.visible) &&
(!footnoteView || !footnoteView.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 haveVolumeUpAction: Settings.volumeUpAction !== BooksSettings.ActionNone
readonly property bool haveVolumeDownAction: Settings.volumeDownAction !== BooksSettings.ActionNone readonly property bool haveVolumeDownAction: Settings.volumeDownAction !== BooksSettings.ActionNone
readonly property bool haveKeyAction: haveVolumeUpAction || haveVolumeDownAction readonly property bool haveKeyAction: haveVolumeUpAction || haveVolumeDownAction

22
app/qml/BooksMainPage.qml
View file

@ -1,6 +1,6 @@
/* /*
Copyright (C) 2015-2016 Jolla Ltd. Copyright (C) 2015-2020 Jolla Ltd.
Contact: Slava Monich <slava.monich@jolla.com> Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
You may use this file under the terms of BSD license as follows: 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 modification, are permitted provided that the following conditions
are met: are met:
* Redistributions of source code must retain the above copyright 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer
documentation and/or other materials provided with the distribution. in the documentation and/or other materials provided with the
* Neither the name of Jolla Ltd nor the names of its contributors may distribution.
be used to endorse or promote products derived from this software 3. Neither the names of the copyright holders nor the names of its
without specific prior written permission. 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" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@ -62,6 +63,7 @@ Page {
opacity: book ? 1 : 0 opacity: book ? 1 : 0
visible: opacity > 0 visible: opacity > 0
orientation: root.orientation orientation: root.orientation
pageActive: root.status === PageStatus.Active
book: Settings.currentBook ? Settings.currentBook : null book: Settings.currentBook ? Settings.currentBook : null
onCloseBook: Settings.currentBook = null onCloseBook: Settings.currentBook = null
Behavior on opacity { FadeAnimation {} } Behavior on opacity { FadeAnimation {} }