Fix another centering issue that could cause 1 pixel offset

jurplel · Sep 4, 2023 · 43b0409 · 43b0409
1 parent 355aca4
commit 43b0409
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 46 deletions.
diff --git a/src/qvgraphicsview.cpp b/src/qvgraphicsview.cpp
@@ -520,9 +520,9 @@ void QVGraphicsView::zoomToFit()
             QSize xRatioSize = (effectiveImageSize * fitXRatio * devicePixelRatioF()).toSize();
             QSize yRatioSize = (effectiveImageSize * fitYRatio * devicePixelRatioF()).toSize();
             QSize maxSize = (QSizeF(viewSize) * devicePixelRatioF()).toSize();
-            // If the aspect ratios are extremely close, it's possible that both are sufficient to
-            // fit the image, but one results in the opposing dimension getting rounded down to
-            // just under the view size, so use the larger of the two ratios in that case.
+            // If the fit ratios are extremely close, it's possible that both are sufficient to
+            // contain the image, but one results in the opposing dimension getting rounded down
+            // to just under the view size, so use the larger of the two ratios in that case.
             if (xRatioSize.boundedTo(maxSize) == xRatioSize && yRatioSize.boundedTo(maxSize) == yRatioSize)
                 targetRatio = qMax(fitXRatio, fitYRatio);
             else
@@ -544,7 +544,25 @@ void QVGraphicsView::originalSize()
 
 void QVGraphicsView::centerImage()
 {
-    centerOn(loadedPixmapItem);
+    QRect viewRect = getUsableViewportRect();
+    QRect contentRect = getContentRect().toRect();
+
+    if (isRightToLeft())
+    {
+        qint64 horizontal = 0;
+        horizontal += horizontalScrollBar()->minimum();
+        horizontal += horizontalScrollBar()->maximum();
+        horizontal -= int((contentRect.width() - viewRect.width()) / 2.0);
+        horizontalScrollBar()->setValue(horizontal);
+    }
+    else
+    {
+        horizontalScrollBar()->setValue(int((contentRect.width() - viewRect.width()) / 2.0));
+    }
+
+    verticalScrollBar()->setValue(int((contentRect.height() - viewRect.height()) / 2.0) - viewRect.top());
+
+    scrollHelper->cancelAnimation();
 }
 
 void QVGraphicsView::goToFile(const GoToFileMode &mode, int index)
@@ -643,42 +661,6 @@ void QVGraphicsView::goToFile(const GoToFileMode &mode, int index)
     loadFile(nextImageFilePath);
 }
 
-void QVGraphicsView::centerOn(const QPointF &pos)
-{
-    QRect targetRect = getUsableViewportRect();
-    QPointF viewPoint = transform().map(pos);
-
-    // Snap to nearest 64th pixel, helps with floating point rounding errors
-    viewPoint = QPointF((viewPoint * 64.0).toPoint()) / 64.0;
-
-    if (isRightToLeft())
-    {
-        qint64 horizontal = 0;
-        horizontal += horizontalScrollBar()->minimum();
-        horizontal += horizontalScrollBar()->maximum();
-        horizontal -= int(viewPoint.x() - (targetRect.width() / 2.0));
-        horizontalScrollBar()->setValue(horizontal);
-    }
-    else
-    {
-        horizontalScrollBar()->setValue(int(viewPoint.x() - (targetRect.width() / 2.0)));
-    }
-
-    verticalScrollBar()->setValue(int(viewPoint.y() - targetRect.top() - (targetRect.height() / 2.0)));
-
-    scrollHelper->cancelAnimation();
-}
-
-void QVGraphicsView::centerOn(qreal x, qreal y)
-{
-    centerOn(QPointF(x, y));
-}
-
-void QVGraphicsView::centerOn(const QGraphicsItem *item)
-{
-    centerOn(item->sceneBoundingRect().center());
-}
-
 QSizeF QVGraphicsView::getEffectiveOriginalSize() const
 {
     return getTransformWithNoScaling().mapRect(QRectF(QPoint(), getCurrentFileDetails().loadedPixmapSize)).size() * getDpiAdjustment();

diff --git a/src/qvgraphicsview.h b/src/qvgraphicsview.h
@@ -111,12 +111,6 @@ class QVGraphicsView : public QGraphicsView
 
     bool event(QEvent *event) override;
 
-    void centerOn(const QPointF &pos);
-
-    void centerOn(qreal x, qreal y);
-
-    void centerOn(const QGraphicsItem *item);
-
     QRectF getContentRect() const;
 
     QRect getUsableViewportRect(bool addOverscan = false) const;