From d291569e5ffb4ea43eb473b1b12e4727307ec75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Sun, 4 May 2025 09:53:31 +0200
Subject: [PATCH] Move drag origin coordinates to MouseHandler

---
 YACReader/mouse_handler.cpp | 11 ++++-------
 YACReader/mouse_handler.h   |  2 ++
 YACReader/viewer.h          |  3 ---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/YACReader/mouse_handler.cpp b/YACReader/mouse_handler.cpp
index 390f0948..e3304d30 100644
--- a/YACReader/mouse_handler.cpp
+++ b/YACReader/mouse_handler.cpp
@@ -25,9 +25,7 @@ void YACReader::MouseHandler::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
         viewer->drag = true;
-        auto position = event->position();
-        viewer->yDragOrigin = position.y();
-        viewer->xDragOrigin = position.x();
+        dragOrigin = dragLatestPosition = event->position();
         viewer->setCursor(Qt::ClosedHandCursor);
         event->accept();
         return;
@@ -88,10 +86,9 @@ void YACReader::MouseHandler::mouseMoveEvent(QMouseEvent *event)
         if (viewer->drag) {
             int currentPosY = viewer->verticalScrollBar()->sliderPosition();
             int currentPosX = viewer->horizontalScrollBar()->sliderPosition();
-            viewer->verticalScrollBar()->setSliderPosition(currentPosY + (viewer->yDragOrigin - position.y()));
-            viewer->horizontalScrollBar()->setSliderPosition(currentPosX + (viewer->xDragOrigin - position.x()));
-            viewer->yDragOrigin = position.y();
-            viewer->xDragOrigin = position.x();
+            viewer->verticalScrollBar()->setSliderPosition(currentPosY + (dragLatestPosition.y() - position.y()));
+            viewer->horizontalScrollBar()->setSliderPosition(currentPosX + (dragLatestPosition.x() - position.x()));
+            dragLatestPosition = position;
         }
     }
 }
diff --git a/YACReader/mouse_handler.h b/YACReader/mouse_handler.h
index 276e558f..1c5345b8 100644
--- a/YACReader/mouse_handler.h
+++ b/YACReader/mouse_handler.h
@@ -17,6 +17,8 @@ public:
 
 private:
     Viewer *viewer;
+    QPointF dragOrigin;
+    QPointF dragLatestPosition;
 };
 }
 
diff --git a/YACReader/viewer.h b/YACReader/viewer.h
index cb955c89..c2bb183b 100644
--- a/YACReader/viewer.h
+++ b/YACReader/viewer.h
@@ -148,9 +148,6 @@ private:
     int translatorXPos;
     QPropertyAnimation *translatorAnimation;
 
-    int yDragOrigin;
-    int xDragOrigin;
-
     NotificationsLabelWidget *notificationsLabel;
 
     bool shouldOpenNext;