diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-05 14:17:47 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-09-05 14:23:37 +0200 |
| commit | a7d03f54eeac78326753fa069b6a60557201904f (patch) | |
| tree | 4c739ac0ba734cf3fb38660f588a9b92a631ff61 | |
| parent | fd73185bd9cc046410cb8253bc9146a44fd83224 (diff) | |
| download | qtquickcontrols-a7d03f54eeac78326753fa069b6a60557201904f.tar.gz | |
Fix menu/combobox popup positioning
Task-number: QTBUG-41113
Change-Id: Ic55657d42b44950356b176334d826b0a8d16e3cd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/controls/qquickpopupwindow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index bcd2837f..eefeadb7 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -93,11 +93,10 @@ void QQuickPopupWindow::show() QPointF pos = m_parentItem->mapToItem(quickWindow->contentItem(), QPointF(posx, posy)); posx = pos.x(); posy = pos.y(); - if (renderWindow) { - QPoint parentWindowOffset = renderWindow->mapToGlobal(QPoint()); - posx += offset.x() + parentWindowOffset.x(); - posy += offset.y() + parentWindowOffset.y(); - } + + QPoint parentWindowOffset = (renderWindow ? renderWindow : quickWindow)->mapToGlobal(QPoint()); + posx += offset.x() + parentWindowOffset.x(); + posy += offset.y() + parentWindowOffset.y(); } if (m_contentItem) { |