diff options
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java | 58 |
1 files changed, 29 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 41dca5f9df..25be522c48 100644 --- a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java +++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java @@ -4,31 +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 final Activity m_activity; private int m_posX; private int m_posY; private int m_buttons; @@ -38,6 +29,7 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O public EditPopupMenu(Activity activity, View layout) { + m_activity = activity; m_view = new EditContextView(activity, this); m_view.addOnLayoutChangeListener(this); @@ -67,15 +59,23 @@ public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.O initOverlay(); m_view.updateButtons(buttons); - final int[] location = new int[2]; - m_layout.getLocationOnScreen(location); + Point viewSize = m_view.getCalculatedSize(); + + final int[] layoutLocation = new int[2]; + m_layout.getLocationOnScreen(layoutLocation); + + // These values are used for handling split screen case + final int[] activityLocation = new int[2]; + final int[] activityLocationInWindow = new int[2]; + m_activity.getWindow().getDecorView().getLocationOnScreen(activityLocation); + m_activity.getWindow().getDecorView().getLocationInWindow(activityLocationInWindow); - int x2 = x + location[0]; - int y2 = y + location[1]; + 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(); @@ -86,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; @@ -135,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; } |