Promote QQuickToolTip's repositioning code to QQuickPopup

QQuickToolTip already had repositioning implemented for both horizontal
and vertical directions. Promote that code up to QQuickPopup so that
QQuickMenu gets properly repositioned when used as a context menu.

As special cases, QQuickComboBox enables vertical flipping for its
popup, and QQuickToolTip enables both. In the QQuickPopup base class,
both are disabled by default.

Task-number: QTBUG-52608
Change-Id: Ia8f835321222d4841a6f79434822b33f057d13fc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 3 insertions, 84 deletions

diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index f7d011c1..0992c2e4 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -127,8 +127,6 @@ public:
     void startTimeout();
     void stopTimeout();
 
-    void reposition() override;
-
     int delay;
     int timeout;
     QString text;
@@ -160,91 +158,12 @@ void QQuickToolTipPrivate::stopTimeout()
     timeoutTimer.stop();
 }
 
-void QQuickToolTipPrivate::reposition()
-{
-    Q_Q(QQuickToolTip);
-    const qreal w = popupItem->width();
-    const qreal h = popupItem->height();
-    const qreal iw = popupItem->implicitWidth();
-    const qreal ih = popupItem->implicitHeight();
-
-    bool widthAdjusted = false;
-    bool heightAdjusted = false;
-
-    QRectF rect(x, y, iw > 0 ? iw : w, ih > 0 ? ih : h);
-    if (parentItem) {
-        rect = parentItem->mapRectToScene(rect);
-
-        QQuickWindow *window = q->window();
-        if (window) {
-            const QRectF bounds = QRectF(0, 0, window->width(), window->height()).marginsRemoved(getMargins());
-
-            if (rect.left() < bounds.left() || rect.right() > bounds.right()) {
-                // if the tooltip doesn't fit inside the window, try flipping it around (left <-> right)
-                const QRectF flipped = parentItem->mapRectToScene(QRectF(parentItem->width() - x - rect.width(), y, rect.width(), rect.height()));
-
-                if (flipped.intersected(bounds).width() > rect.intersected(bounds).width())
-                    rect.moveLeft(flipped.left());
-
-                if (iw > 0) {
-                    // neither the flipped around geometry fits inside the window, choose
-                    // whichever side (left vs. right) fits larger part of the popup
-                    if (rect.left() < bounds.left() && bounds.left() + rect.width() <= bounds.right())
-                        rect.moveLeft(bounds.left());
-                    else if (rect.right() > bounds.right() && bounds.right() - rect.width() >= bounds.left())
-                        rect.moveRight(bounds.right());
-
-                    // as a last resort, adjust width to fit the window
-                    if (rect.left() < bounds.left()) {
-                        rect.setLeft(bounds.left());
-                        widthAdjusted = true;
-                    }
-                    if (rect.right() > bounds.right()) {
-                        rect.setRight(bounds.right());
-                        widthAdjusted = true;
-                    }
-                }
-            }
-
-            if (rect.top() < bounds.top() || rect.bottom() > bounds.bottom()) {
-                // if the tooltip doesn't fit inside the window, try flipping it around (above <-> below)
-                const QRectF flipped = parentItem->mapRectToScene(QRectF(x, parentItem->height() - y - rect.height(), rect.width(), rect.height()));
-
-                if (flipped.intersected(bounds).height() > rect.intersected(bounds).height())
-                    rect.moveTop(flipped.top());
-
-                if (ih > 0) {
-                    // neither the flipped around geometry fits inside the window, choose
-                    // whichever side (above vs. below) fits larger part of the popup
-                    if (rect.top() < bounds.top() && bounds.top() + rect.height() <= bounds.bottom())
-                        rect.moveTop(bounds.top());
-                    else if (rect.bottom() > bounds.bottom() && bounds.bottom() - rect.height() >= bounds.top())
-                        rect.moveBottom(bounds.bottom());
-
-                    // as a last resort, adjust height to fit the window
-                    if (rect.top() < bounds.top()) {
-                        rect.setTop(bounds.top());
-                        heightAdjusted = true;
-                    }
-                    if (rect.bottom() > bounds.bottom()) {
-                        rect.setBottom(bounds.bottom());
-                        heightAdjusted = true;
-                    }
-                }
-            }
-        }
-    }
-
-    popupItem->setPosition(rect.topLeft());
-    if (widthAdjusted && rect.width() > 0)
-        popupItem->setWidth(rect.width());
-    if (heightAdjusted && rect.height() > 0)
-        popupItem->setHeight(rect.height());
-}
-
 QQuickToolTip::QQuickToolTip(QQuickItem *parent) :
     QQuickPopup(*(new QQuickToolTipPrivate), parent)
 {
+    Q_D(QQuickToolTip);
+    d->allowVerticalFlip = true;
+    d->allowHorizontalFlip = true;
 }
 
 /*!