From 3b577dfe798bf5065a2bba4d7095709454aa709c Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 29 Sep 2014 13:43:35 +0300 Subject: 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 Reviewed-by: Paul Olav Tvete --- src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/android/jar/src/org/qtproject/qt5/android/QtNative.java') diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index aba4cfa502..51688441e0 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -440,12 +440,12 @@ public class QtNative return m_clipboardManager.getText().toString(); } - private static void openContextMenu() + private static void openContextMenu(final int x, final int y, final int w, final int h) { runAction(new Runnable() { @Override public void run() { - m_activityDelegate.openContextMenu(); + m_activityDelegate.openContextMenu(x, y, w, h); } }); } @@ -611,6 +611,7 @@ public class QtNative public static native void onOptionsMenuClosed(Menu menu); public static native void onCreateContextMenu(ContextMenu menu); + public static native void fillContextMenu(Menu menu); public static native boolean onContextItemSelected(int itemId, boolean checked); public static native void onContextMenuClosed(Menu menu); // menu methods -- cgit v1.2.3