Fixed errors with page being out of bounds

Author: DavidLazarescu

src/presentation/desktop/modules/CppElements/document_view.cpp

@@ -19,7 +19,16 @@ DocumentView::DocumentView()
     m_contentItem->setY(0);
 
     // Redraw the page when the height changes
-    connect(this, &QQuickItem::heightChanged, this, &DocumentView::redrawPages);
+    connect(this, &QQuickItem::heightChanged, this,
+            [this]()
+            {
+                ensureInBounds();
+                redrawPages();
+            });
+
+    // Update the current page when the content Y changes
+    connect(this, &DocumentView::contentYChanged, this,
+            &DocumentView::updateCurrentPage);
 
     // Ensure the content item has the same width as the document view
     connect(this, &QQuickItem::implicitWidthChanged, this,
@@ -51,6 +60,15 @@ void DocumentView::setBookController(
     redrawPages();
 }
 
+void DocumentView::loadDefaultBookData()
+{
+    if(m_bookController == nullptr)
+        return;
+
+    auto newContentY = getContentYForPage(m_bookController->getCurrentPage());
+    setContentY(newContentY);
+}
+
 QSGNode* DocumentView::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*)
 {
     return oldNode;
@@ -166,8 +184,6 @@ QPair<int, int> DocumentView::getPageSpanToRender()
     int first = m_contentY / pageStep;
     int last = (m_contentY + height()) / pageStep;
 
-    qDebug() << "First: " << first << "\tLast: " << last;
-
     // For the case that contentY perfectly aligns with the book
     // start (0) or end, we need to add or subtract 1
     if(last >= m_bookController->getPageCount())
@@ -274,16 +290,21 @@ void DocumentView::ensureInBounds()
     emit contentYChanged();
 }
 
-void DocumentView::loadDefaultBookData()
+void DocumentView::updateCurrentPage()
 {
-    if(m_bookController == nullptr)
-        return;
+    // The current page is the one at the middle of the screen
+    double pageStep = (m_pageHeight + m_spacing) * m_currentZoom;
+    int currentPage = (m_contentY + height() / 2) / pageStep;
+    if(currentPage != m_currentPage)
+    {
+        m_currentPage = currentPage;
+        emit currentPageChanged();
+    }
+}
 
-    // Calculate content y
-    auto x = m_bookController->getCurrentPage();
-    auto newContentY = m_bookController->getCurrentPage() *
-                       (m_pageHeight + m_spacing) * m_currentZoom;
-    setContentY(newContentY);
+long DocumentView::getContentYForPage(int page) const
+{
+    return page * (m_pageHeight + m_spacing) * m_currentZoom;
 }
 
 long DocumentView::getContentHeight() const
@@ -305,6 +326,7 @@ void DocumentView::setContentY(long newContentY)
     m_contentItem->setY(-m_contentY);
     emit contentYChanged();
 
+    ensureInBounds();
     redrawPages();
 }
 
@@ -343,4 +365,23 @@ void DocumentView::setCurrentZoom(double newCurrentZoom)
     applyZoom(newCurrentZoom, ZoomMode::Keyboard);
 }
 
+int DocumentView::currentPage() const
+{
+    return m_currentPage;
+}
+
+void DocumentView::setCurrentPage(int newCurrentPage)
+{
+    if(m_currentPage == newCurrentPage)
+        return;
+
+    if(newCurrentPage < 0 || newCurrentPage >= m_bookController->getPageCount())
+        return;
+
+    m_currentPage = newCurrentPage;
+    auto newContentY = getContentYForPage(newCurrentPage);
+    setContentY(newContentY);
+    emit currentPageChanged();
+}
+
 }  // namespace cpp_elements

src/presentation/desktop/modules/CppElements/document_view.hpp

@@ -23,6 +23,8 @@ class PRESENTATION_EXPORT DocumentView : public QQuickItem
         long contentX READ getContentX WRITE setContentX NOTIFY contentXChanged)
     Q_PROPERTY(double currentZoom READ getCurrentZoom WRITE setCurrentZoom
                    NOTIFY currentZoomChanged)
+    Q_PROPERTY(int currentPage READ currentPage WRITE setCurrentPage NOTIFY
+                   currentPageChanged)
 
 public:
     DocumentView();
@@ -36,12 +38,16 @@ class PRESENTATION_EXPORT DocumentView : public QQuickItem
     double getCurrentZoom() const;
     void setCurrentZoom(double newCurrentZoom);
 
+    int currentPage() const;
+    void setCurrentPage(int newCurrentPage);
+
 signals:
     void contentHeightChanged();
     void contentYChanged();
     void contentXChanged();
     void contentWidthChanged();
     void currentZoomChanged();
+    void currentPageChanged();
 
 protected:
     QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) override;
@@ -68,6 +74,8 @@ class PRESENTATION_EXPORT DocumentView : public QQuickItem
     double contentYForMouseZoom(double scale);
     void ensureInBounds();
     void loadDefaultBookData();
+    void updateCurrentPage();
+    long getContentYForPage(int page) const;
 
     adapters::IBookController* m_bookController = nullptr;
     QHash<int, PageView*> m_activePages;
@@ -78,6 +86,7 @@ class PRESENTATION_EXPORT DocumentView : public QQuickItem
     double m_currentZoom = 1;
     double m_zoomFactor = 0.13;
     int m_spacing = 5;
+    int m_currentPage = 0;
 };
 
 }  // namespace cpp_elements

src/presentation/desktop/readingPage/MDocumentView.qml

@@ -53,10 +53,6 @@ Pane {
     clip: true
 
     Component.onCompleted: documentView.forceActiveFocus()
-
-    function testX() {
-      console.log("Link Works!")
-    }
   }
 
   ScrollBar {

src/presentation/desktop/readingPage/MReadingPage.qml

@@ -106,7 +106,6 @@ Page {
         MReadingToolBar {
             id: toolbar
             Layout.fillWidth: true
-            currentPage: BookController.currentPage
             pageCount: BookController.pageCount
             bookTitle: Globals.selectedBook.title
 
@@ -322,8 +321,7 @@ Page {
         property bool fullScreen: false
         property int prevCurrentPage: -1
 
-        // Just assign it once (no binding)
-        Component.onCompleted: prevCurrentPage = BookController.currentPage
+        Component.onCompleted: prevCurrentPage = documentView.documentView.currentPage
 
         function startFullScreenMode() {
             if (internal.fullScreen)
@@ -350,7 +348,7 @@ Page {
         }
 
         function saveCurrentPage() {
-            let currentPage = BookController.currentPage
+            let currentPage = documentView.documentView.currentPage
             if (currentPage === internal.prevCurrentPage)
                 return
 

src/presentation/desktop/readingPage/readingToolbar/MReadingToolBar.qml

@@ -12,7 +12,6 @@ Pane {
     id: root
     property bool fullScreenMode: false
     property string bookTitle: qsTr("Unknown name")
-    property int currentPage: 0
     property int lastPage: 0
     property int pageCount: 0
     property alias chapterButton: chapterButton
@@ -143,10 +142,10 @@ Pane {
                         horizontalAlignment: TextInput.AlignHCenter
                         verticalAlignment: TextInput.AlignVCenter
                         selectByMouse: true
-                        text: root.currentPage + 1
                         color: Style.colorBaseInputText
                         font.pointSize: Fonts.size12
                         font.weight: Font.Normal
+                        text: documentView.documentView.currentPage + 1
                         validator: IntValidator {
                             bottom: 0
                             top: 99999
@@ -165,18 +164,10 @@ Pane {
                         // but we present them as 1 to pageCount to the user.
                         onEditingFinished: {
                             let newPage = Number(inputField.text)
-                            if (root.currentPage == newPage - 1)
-                                return
-
-                            if (newPage < 1 || newPage > root.pageCount) {
-                                inputField.text = Qt.binding(
-                                            () => root.currentPage + 1)
-                                return
-                            }
-
-                            documentView.setPage(newPage - 1)
-                            documentView.forceActiveFocus(
-                                        ) // Discard focus when finished
+                            documentView.documentView.currentPage = newPage - 1
+
+                            // Discard focus when finished
+                            documentView.documentView.forceActiveFocus()
                         }
                     }
                 }