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

[app] A few more tweaks to reduce jumping between the pages

Browse source
This commit is contained in:
Slava Monich 2020-02-03 03:09:13 +02:00
parent 6b5fb10b15
commit 8529942924
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/qml/BooksBookView.qml
View file

@ -87,6 +87,8 @@ SilicaFlickable {
}
}
onBookChanged: if (!book) pager.currentPage = 0
Component {
id: linkMenuComponent
BooksLinkMenu { }
@ -259,7 +261,7 @@ SilicaFlickable {
property int jumpingTo: -1
function jumpTo(page) {
if (page >=0 && page !== bookViewWatcher.currentIndex) {
if (book && page >=0 && page !== bookViewWatcher.currentIndex) {
jumpingTo = page
bookViewWatcher.positionViewAtIndex(page)
pager.currentPage = page

23
app/src/BooksBookModel.cpp
View file

@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2018 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2015-2020 Jolla Ltd.
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@ -8,15 +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
@ -360,6 +360,7 @@ void BooksBookModel::setBook(BooksBook* aBook)
iBookRef.reset();
iTitle = QString();
iPageStack->clear();
iPageStack->setPageMarks(BooksPos::List());
HDEBUG("<none>");
}
startReset(ReasonLoading, true);