Fixed color inversion & Bug with tag selection leading to crash

Author: DavidLazarescu

src/adapters/interfaces/controllers/i_opened_book_controller.hpp

@@ -21,6 +21,8 @@ class ADAPTERS_EXPORT IOpenedBookController : public QObject
     Q_PROPERTY(int pageCount READ getPageCount NOTIFY pageCountChanged)
     Q_PROPERTY(int currentPage READ getCurrentPage WRITE setCurrentPage NOTIFY
                    currentPageChanged)
+    Q_PROPERTY(QString colorTheme READ getColorTheme WRITE setColorTheme NOTIFY
+                   colorThemeChanged)
     Q_PROPERTY(adapters::data_models::BookmarksProxyModel* bookmarksModel READ
                    getBookmarksModel NOTIFY bookmarksModelChanged)
 

src/presentation/desktop/homePage/manageTagsPopup/MManageTagsPopup.qml

@@ -79,7 +79,7 @@ Popup {
                 Layout.fillWidth: true
 
                 onAddTag: name => {
-                              // Cant use return value, bc. it is null if tag already exists
+                              // Can't use return value, bc. it is null if tag already exists
                               UserController.addTag(name)
 
                               let tagUuid = UserController.getTagUuidForName(

src/presentation/desktop/homePage/manageTagsPopup/MTagItem.qml

@@ -11,6 +11,7 @@ Item {
     id: root
     required property int index
     property bool selected: false
+    property bool currentlyRenaming: false
     readonly property alias renameable: container.renameable
     signal removeTag(int index)
     signal renamedTag(int index, string text)
@@ -111,6 +112,7 @@ Item {
     }
 
     function startRenaming() {
+        currentlyRenaming = true
         content.readOnly = false
         content.selectAll()
         content.forceActiveFocus()
@@ -120,6 +122,9 @@ Item {
     }
 
     function stopRenaming(saveText = true) {
+        if (!currentlyRenaming)
+            return
+
         content.readOnly = true
         content.select(0, 0)
         content.deselect()

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

@@ -188,12 +188,7 @@ bool Document::event(QEvent *event)
         auto *gestureEvent = static_cast<QNativeGestureEvent *>(event);
 
         if (gestureEvent->gestureType() == Qt::ZoomNativeGesture) {
-            qreal zoomDelta = gestureEvent->value();
-
-            qreal newZoom = calculateNewZoom(zoomDelta, std::abs(zoomDelta));
-            applyZoom(newZoom, ZoomMode::Mouse);
-
-            gestureEvent->accept();
+            handleMousepadZoom(gestureEvent);
             return true;
         }
     }
@@ -217,6 +212,8 @@ void Document::redrawPages()
         if(page == nullptr)
         {
             page = createPage(i);
+            page->setIncludeNewLinesInCopiedText(m_includeNewLinesInCopiedText);
+            page->setColorInverted(m_colorInverted);
             m_activePages.emplace(i, page);
         }
 
@@ -431,6 +428,16 @@ void Document::setCurrentPageWithOffsetY(int currentPage, int offsetY)
     emit currentPageChanged();
 }
 
+void Document::handleMousepadZoom(QNativeGestureEvent* event)
+{
+    qreal zoomDelta = event->value();
+
+    qreal newZoom = calculateNewZoom(zoomDelta, std::abs(zoomDelta));
+    applyZoom(newZoom, ZoomMode::Mouse);
+
+    event->accept();
+}
+
 Qt::Key Document::getShortcut(const QString& value)
 {
     if(m_settingsController == nullptr)
@@ -616,4 +623,20 @@ void Document::setSettingsController(
     m_settingsController = newSettingsController;
 }
 
+void Document::setColorInverted(bool newColorInverted)
+{
+    for(auto book : m_activePages.values())
+        book->setColorInverted(newColorInverted);
+
+    m_colorInverted = newColorInverted;
+}
+
+void Document::setIncludeNewLinesInCopiedText(bool newIncludeNewLinesInCopiedText)
+{
+    for(auto book : m_activePages.values())
+        book->setIncludeNewLinesInCopiedText(newIncludeNewLinesInCopiedText);
+
+    m_includeNewLinesInCopiedText = newIncludeNewLinesInCopiedText;
+}
+
 }  // namespace cpp_elements

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

@@ -38,6 +38,9 @@ class PRESENTATION_EXPORT Document : public QQuickItem
     Q_PROPERTY(int topPageYOffset READ getTopPageYOffset CONSTANT)
     Q_PROPERTY(adapters::IDocumentSearcher* documentSearcher READ
                    getDocumentSearcher CONSTANT)
+    Q_PROPERTY(bool colorInverted WRITE setColorInverted)
+    Q_PROPERTY(bool includeNewLinesInCopiedText WRITE setIncludeNewLinesInCopiedText)
+
 
 public:
     Document();
@@ -67,6 +70,9 @@ class PRESENTATION_EXPORT Document : public QQuickItem
     Q_INVOKABLE void restoreCursor();
     Q_INVOKABLE void hideCursor();
 
+    void setColorInverted(bool newColorInverted);
+    void setIncludeNewLinesInCopiedText(bool newIncludeNewLinesInCopiedText);
+
 signals:
     void mouseMoved(double x, double y);
     void contentHeightChanged();
@@ -109,6 +115,7 @@ class PRESENTATION_EXPORT Document : public QQuickItem
     void updateCurrentPage();
     long getContentYForPage(int page) const;
     void setCurrentPageWithOffsetY(int currentPage, int offsetY);
+    void handleMousepadZoom(QNativeGestureEvent* event);
     Qt::Key getShortcut(const QString& value);
 
     adapters::IOpenedBookController* m_openedBookController = nullptr;
@@ -130,6 +137,8 @@ class PRESENTATION_EXPORT Document : public QQuickItem
     // Table of Contents
     std::unique_ptr<adapters::data_models::FilteredTOCModel> m_filteredTOCModel;
     std::unique_ptr<adapters::data_models::TOCModel> m_TOCModel;
+    bool m_colorInverted;
+    bool m_includeNewLinesInCopiedText;
 };
 
 }  // namespace cpp_elements

src/presentation/desktop/readingPage/MDocumentView.qml

@@ -46,6 +46,9 @@ Pane {
         anchors.centerIn: parent
         openedBookController: root.openedBookController
         settingsController: SettingsController
+        colorInverted: root.openedBookController.colorTheme === "Inverted"
+        includeNewLinesInCopiedText: SettingsController.behaviorSettings.IncludeNewLinesInCopiedText
+                                     === "ON"
         clip: true
 
         onCurrentZoomChanged: root.zoomChanged(document.currentZoom)