Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 10a9f79

Browse files
keianhzobluemarvin
authored andcommitted
Dismiss context menu when scrolling (#2271)
1 parent 2508c05 commit 10a9f79

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/BookmarksCallback.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ default void onSyncBookmarks(@NonNull View view) {}
1212
default void onFxALogin(@NonNull View view) {}
1313
default void onFxASynSettings(@NonNull View view) {}
1414
default void onShowContextMenu(@NonNull View view, Bookmark item, boolean isLastVisibleItem) {}
15+
default void onHideContextMenu(@NonNull View view) {}
1516
}

app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/HistoryCallback.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ default void onSyncHistory(@NonNull View view) {}
1212
default void onFxALogin(@NonNull View view) {}
1313
default void onFxASynSettings(@NonNull View view) {}
1414
default void onShowContextMenu(@NonNull View view, @NonNull VisitInfo item, boolean isLastVisibleItem) {}
15+
default void onHideContextMenu(@NonNull View view) {}
1516
}

app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ private void initialize(Context aContext) {
9797
v.requestFocusFromTouch();
9898
return false;
9999
});
100+
mBinding.bookmarksList.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> mBookmarksViewListeners.forEach((listener) -> listener.onHideContextMenu(v)));
100101
mBinding.bookmarksList.setHasFixedSize(true);
101102
mBinding.bookmarksList.setItemViewCacheSize(20);
102103
mBinding.bookmarksList.setDrawingCacheEnabled(true);

app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ private void initialize(Context aContext) {
102102
v.requestFocusFromTouch();
103103
return false;
104104
});
105+
mBinding.historyList.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> mHistoryViewListeners.forEach((listener) -> listener.onHideContextMenu(v)));
105106
mBinding.historyList.setHasFixedSize(true);
106107
mBinding.historyList.setItemViewCacheSize(20);
107108
mBinding.historyList.setDrawingCacheEnabled(true);

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,6 +1390,11 @@ public void onShowContextMenu(@NonNull View view, @NotNull Bookmark item, boolea
13901390
public void onFxASynSettings(@NonNull View view) {
13911391
mWidgetManager.getTray().toggleSettingsDialog(SettingsWidget.SettingDialog.FXA);
13921392
}
1393+
1394+
@Override
1395+
public void onHideContextMenu(@NonNull View view) {
1396+
hideContextMenus();
1397+
}
13931398
};
13941399

13951400
private HistoryCallback mHistoryListener = new HistoryCallback() {
@@ -1414,6 +1419,11 @@ public void onShowContextMenu(@NonNull View view, @NonNull VisitInfo item, boole
14141419
public void onFxASynSettings(@NonNull View view) {
14151420
mWidgetManager.getTray().toggleSettingsDialog(SettingsWidget.SettingDialog.FXA);
14161421
}
1422+
1423+
@Override
1424+
public void onHideContextMenu(@NonNull View view) {
1425+
hideContextMenus();
1426+
}
14171427
};
14181428

14191429
private void hideContextMenus() {

0 commit comments

Comments
 (0)