summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidplatformmenu.cpp
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2014-09-29 13:43:35 +0300
committerBogDan Vatra <bogdan@kde.org>2014-10-01 20:10:58 +0200
commit3b577dfe798bf5065a2bba4d7095709454aa709c (patch)
tree14172b58fac4e15662c58dbbd53c5790df48681a /src/plugins/platforms/android/qandroidplatformmenu.cpp
parent8ee9774e67edf57d891528749a360a0af8f0c6f7 (diff)
Use PopupMenu when possible.
On API-11+ we are going to use PopupMenu instead of ContextMenu to show context menus. A PopupMenu displays a Menu in a modal popup window anchored to a View. The popup will appear below the anchor view if there is room, or above it if there is not. Task-number: QTBUG-39736 Change-Id: Ie412ab0935b868348ce5c8bb0bf53571ffefd582 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformmenu.cpp')
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenu.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp
index a282ecd136..f3505fac3c 100644
--- a/src/plugins/platforms/android/qandroidplatformmenu.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp
@@ -135,13 +135,12 @@ bool QAndroidPlatformMenu::isVisible() const
return m_isVisible;
}
-void QAndroidPlatformMenu::showPopup(const QWindow *parentWindow, QPoint pos, const QPlatformMenuItem *item)
+void QAndroidPlatformMenu::showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item)
{
Q_UNUSED(parentWindow);
- Q_UNUSED(pos);
Q_UNUSED(item);
setVisible(true);
- QtAndroidMenu::showContextMenu(this);
+ QtAndroidMenu::showContextMenu(this, targetRect);
}
QPlatformMenuItem *QAndroidPlatformMenu::menuItemAt(int position) const