1 files changed, 21 insertions, 29 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
index 00cbb97561..00097f4003 100644
--- a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
@@ -4,32 +4,22 @@
 
 package org.qtproject.qt.android;
 
+import android.app.Activity;
 import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
+import android.graphics.Point;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.ImageView;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.view.MotionEvent;
-import android.widget.PopupWindow;
-import android.app.Activity;
-import android.view.ViewTreeObserver;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup;
-import android.R;
+import android.view.ViewTreeObserver;
+import android.widget.PopupWindow;
 
 // Helper class that manages a cursor or selection handle
-public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayoutChangeListener,
+class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayoutChangeListener,
         EditContextView.OnClickListener
 {
-    private View m_layout = null;
-    private EditContextView m_view = null;
+    private final View m_layout;
+    private final EditContextView m_view;
     private PopupWindow m_popup = null;
-    private Activity m_activity;
+    private final Activity m_activity;
     private int m_posX;
     private int m_posY;
     private int m_buttons;
@@ -37,7 +27,7 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
     private CursorHandle m_leftSelectionHandle;
     private CursorHandle m_rightSelectionHandle;
 
-    public EditPopupMenu(Activity activity, View layout)
+    EditPopupMenu(Activity activity, View layout)
     {
         m_activity = activity;
         m_view = new EditContextView(activity, this);
@@ -63,12 +53,14 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
     }
 
     // Show the handle at a given position (or move it if it is already shown)
-    public void setPosition(final int x, final int y, final int buttons,
+    void setPosition(final int x, final int y, final int buttons,
                             CursorHandle cursorHandle, CursorHandle leftSelectionHandle, CursorHandle rightSelectionHandle)
     {
         initOverlay();
 
         m_view.updateButtons(buttons);
+        Point viewSize = m_view.getCalculatedSize();
+
         final int[] layoutLocation = new int[2];
         m_layout.getLocationOnScreen(layoutLocation);
 
@@ -81,9 +73,9 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
         int x2 = x + layoutLocation[0] - activityLocation[0];
         int y2 = y + layoutLocation[1] + (activityLocationInWindow[1] - activityLocation[1]);
 
-        x2 -= m_view.getWidth() / 2 ;
+        x2 -= viewSize.x / 2 ;
 
-        y2 -= m_view.getHeight();
+        y2 -= viewSize.y;
         if (y2 < 0) {
             if (cursorHandle != null) {
                 y2 = cursorHandle.bottom();
@@ -94,8 +86,8 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
             }
         }
 
-        if (m_layout.getWidth() < x + m_view.getWidth() / 2)
-            x2 = m_layout.getWidth() - m_view.getWidth();
+        if (m_layout.getWidth() < x + viewSize.x / 2)
+            x2 = m_layout.getWidth() - viewSize.x;
 
         if (x2 < 0)
             x2 = 0;
@@ -113,7 +105,7 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
         m_rightSelectionHandle = rightSelectionHandle;
     }
 
-    public void hide() {
+    void hide() {
         if (m_popup != null) {
             m_popup.dismiss();
             m_popup = null;
@@ -143,16 +135,16 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O
     @Override
     public void contextButtonClicked(int buttonId) {
         switch (buttonId) {
-        case R.string.cut:
+        case android.R.string.cut:
             QtNativeInputConnection.cut();
             break;
-        case R.string.copy:
+        case android.R.string.copy:
             QtNativeInputConnection.copy();
             break;
-        case R.string.paste:
+        case android.R.string.paste:
             QtNativeInputConnection.paste();
             break;
-        case R.string.selectAll:
+        case android.R.string.selectAll:
             QtNativeInputConnection.selectAll();
             break;
         }