diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-26 13:22:33 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-27 12:03:59 +0000 |
commit | f1e139b9ac02313f541ed6749f05e265f4c8bf13 (patch) | |
tree | a29df97ee1881a6c8e44e502c57c8a1972d88d81 /src/quicktemplates2/qquickoverlay.cpp | |
parent | b94889f49170e3d8df5b348d3f179445d892f232 (diff) |
Popups: take Window::contentOrientation into account
Task-number: QTBUG-62158
Change-Id: I0bcf5b02da6a3500e4324462d5f1249a6178c9fd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickoverlay.cpp')
-rw-r--r-- | src/quicktemplates2/qquickoverlay.cpp | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 8de37d1c..a1d82de0 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -169,10 +169,9 @@ QVector<QQuickDrawer *> QQuickOverlayPrivate::stackingOrderDrawers() const return sorted; } -void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &) +void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) { - Q_Q(QQuickOverlay); - q->setSize(QSizeF(item->width(), item->height())); + updateGeometry(); } QQuickOverlayPrivate::QQuickOverlayPrivate() @@ -342,6 +341,43 @@ void QQuickOverlayPrivate::setMouseGrabberPopup(QQuickPopup *popup) mouseGrabberPopup = popup; } +void QQuickOverlayPrivate::updateGeometry() +{ + Q_Q(QQuickOverlay); + if (!window) + return; + + QPointF pos; + QSizeF size = window->size(); + qreal rotation = 0; + + switch (window->contentOrientation()) { + case Qt::PrimaryOrientation: + case Qt::PortraitOrientation: + size = window->size(); + break; + case Qt::LandscapeOrientation: + rotation = 90; + pos = QPointF((size.width() - size.height()) / 2, -(size.width() - size.height()) / 2); + size.transpose(); + break; + case Qt::InvertedPortraitOrientation: + rotation = 180; + break; + case Qt::InvertedLandscapeOrientation: + rotation = 270; + pos = QPointF((size.width() - size.height()) / 2, -(size.width() - size.height()) / 2); + size.transpose(); + break; + default: + break; + } + + q->setSize(size); + q->setPosition(pos); + q->setRotation(rotation); +} + QQuickOverlay::QQuickOverlay(QQuickItem *parent) : QQuickItem(*(new QQuickOverlayPrivate), parent) { @@ -352,10 +388,12 @@ QQuickOverlay::QQuickOverlay(QQuickItem *parent) setVisible(false); if (parent) { - setSize(QSizeF(parent->width(), parent->height())); + d->updateGeometry(); QQuickItemPrivate::get(parent)->addItemChangeListener(d, QQuickItemPrivate::Geometry); - if (QQuickWindow *window = parent->window()) + if (QQuickWindow *window = parent->window()) { window->installEventFilter(this); + QObjectPrivate::connect(window, &QWindow::contentOrientationChanged, d, &QQuickOverlayPrivate::updateGeometry); + } } } |