diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 00:09:13 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 09:41:59 +0000 |
commit | 8efc7cc41eaafcdbb83c0b7ce00a0af0636175fb (patch) | |
tree | a77d7d269eafcbc0c234d3d4ddbd8ba47dc1c3b9 /src/quicktemplates2/qquickmenu.cpp | |
parent | 1642a45fedabd671a4d05fe9e6632e344857951b (diff) |
Menu: leave transformOrigin to be defined in QML
Change-Id: I960d90a7d1604f35a67dfe5f4adb57d4d62968f9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 8fe5014a..634528c1 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -431,17 +431,13 @@ void QQuickMenuPrivate::openSubMenu(QQuickMenuItem *item, bool activate) if (cascade) { subMenu->setParentItem(item); subMenu->setClosePolicy(cascadingSubMenuClosePolicy); - if (popupItem->isMirrored()) { - subMenu->setTransformOrigin(QQuickPopup::TopRight); + if (popupItem->isMirrored()) subMenu->setPosition(QPointF(-subMenu->width() - q->leftPadding() + subMenu->overlap(), -subMenu->topPadding())); - } else { - subMenu->setTransformOrigin(QQuickPopup::TopLeft); + else subMenu->setPosition(QPointF(item->width() + q->rightPadding() - subMenu->overlap(), -subMenu->topPadding())); - } } else { subMenu->setParentItem(parentItem); subMenu->setClosePolicy(defaultMenuClosePolicy); - subMenu->setTransformOrigin(QQuickPopup::Center); subMenu->setPosition(QPointF(q->x() + (q->width() - subMenu->width()) / 2, q->y() + (q->height() - subMenu->height()) / 2)); } |