diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java index 02653aafa..bcb48bb8d 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java @@ -23,6 +23,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.inputmethod.EditorInfo; +import android.widget.EditText; import android.widget.FrameLayout; import androidx.annotation.NonNull; @@ -97,7 +98,7 @@ public interface NavigationURLBarDelegate { void onVoiceSearchClicked(); void onShowAwesomeBar(); void onHideAwesomeBar(); - void onLongPress(float centerX, SelectionActionWidget actionMenu); + void onURLSelectionAction(EditText aURLEdit, float centerX, SelectionActionWidget actionMenu); void onPopUpButtonClicked(); } @@ -206,7 +207,7 @@ private void initialize(Context aContext) { showSelectionMenu(); } else { - mDelegate.onLongPress(getSelectionCenterX(), mSelectionMenu); + mDelegate.onURLSelectionAction(mBinding.urlEditText, getSelectionCenterX(), mSelectionMenu); mSelectionMenu.updateWidget(); } } @@ -630,7 +631,7 @@ public void onDismiss() { } if (mDelegate != null) { - mDelegate.onLongPress(getSelectionCenterX(), mSelectionMenu); + mDelegate.onURLSelectionAction(mBinding.urlEditText, getSelectionCenterX(), mSelectionMenu); } mSelectionMenu.show(UIWidget.KEEP_FOCUS); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java index 5594653e8..22730c93e 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java @@ -16,6 +16,7 @@ import android.util.Pair; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -980,15 +981,15 @@ public void onHideAwesomeBar() { } @Override - public void onLongPress(float centerX, SelectionActionWidget actionMenu) { + public void onURLSelectionAction(EditText aURLEdit, float centerX, SelectionActionWidget actionMenu) { actionMenu.getPlacement().parentHandle = this.getHandle(); actionMenu.getPlacement().parentAnchorY = 1.0f; - actionMenu.getPlacement().anchorY = 0.34f; + actionMenu.getPlacement().anchorY = 0.44f; Rect offsetViewBounds = new Rect(); - mURLBar.getDrawingRect(offsetViewBounds); - offsetDescendantRectToMyCoords(mURLBar, offsetViewBounds); - float x = offsetViewBounds.left + centerX; - actionMenu.getPlacement().parentAnchorX = x / getMeasuredWidth(); + aURLEdit.getDrawingRect(offsetViewBounds); + offsetDescendantRectToMyCoords(aURLEdit, offsetViewBounds); + float x = aURLEdit.getPaddingLeft() + offsetViewBounds.left + centerX; + actionMenu.getPlacement().parentAnchorX = x / getWidth(); } @Override diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java index f0b9d76ee..20be80517 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java @@ -61,7 +61,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) { aPlacement.anchorY = 0.5f; aPlacement.translationX = 0.0f; aPlacement.translationY = 0.0f; - aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.context_menu_z_distance); + aPlacement.translationZ = 1.0f; aPlacement.visible = false; }