Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for disappearing context menus #2376

Merged
merged 1 commit into from Nov 26, 2019
Merged

Fix for disappearing context menus #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Expand Up @@ -418,7 +418,7 @@ public void detachFromWindow() {
}
mAttachedWindow = null;
if (mAwesomeBar != null && mAwesomeBar.isVisible()) {
onHideAwesomeBar();
mAwesomeBar.hideNoAnim(UIWidget.KEEP_WIDGET);
}
}

Expand Down
7 changes: 6 additions & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/SuggestionsWidget.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
import org.mozilla.vrbrowser.R;
import org.mozilla.vrbrowser.audio.AudioEngine;
import org.mozilla.vrbrowser.ui.views.CustomListView;
import org.mozilla.vrbrowser.utils.ViewUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -125,11 +126,15 @@ public void hide(@HideFlags int aHideFlags) {
mList.startAnimation(mScaleDownAnimation);
}

public void hideNoAnim(@HideFlags int aHideFlags) {
super.hide(aHideFlags);
}

// FocusChangeListener

@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
if (oldFocus != null && isVisible()) {
if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
onDismiss();
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java
View file
Open in desktop
Expand Up @@ -184,7 +184,7 @@ private void handleAction(View sender) {

@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
if (!ViewUtils.isChildrenOf(getChildAt(0), newFocus)) {
if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
onDismiss();
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/ContextMenuWidget.java
View file
Open in desktop
Expand Up @@ -122,7 +122,7 @@ public void setContextElement(GeckoSession.ContentDelegate.ContextElement aConte

@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
if (!ViewUtils.isChildrenOf(this, newFocus) && isVisible()) {
if (!ViewUtils.isEqualOrChildrenOf(this, newFocus) && isVisible()) {
onDismiss();
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java
View file
Open in desktop
Expand Up @@ -123,8 +123,8 @@ private void createMenuItems() {

@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
if (!ViewUtils.isChildrenOf(menuContainer, newFocus)) {
hide(KEEP_WIDGET);
if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
onDismiss();
}
}
}
4 changes: 2 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/LibraryMenuWidget.java
View file
Open in desktop
Expand Up @@ -140,8 +140,8 @@ private void createMenuItems(boolean canOpenWindows, boolean isBookmarked) {

@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
if (!ViewUtils.isChildrenOf(menuContainer, newFocus)) {
hide(KEEP_WIDGET);
if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
onDismiss();
}
}
}