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

Commit ccc192f

Browse files
keianhzobluemarvin
authored andcommitted
Fixes #3607 Fixes #3606 What's new fixes (#3614)
* Update viewmodel size when placement is updates * Request focus when what's new is clicked
1 parent 07a9c9a commit ccc192f

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ private void updateUI() {
263263
});
264264

265265
mBinding.navigationBarNavigation.whatsNew.setOnClickListener(v -> {
266+
v.requestFocusFromTouch();
266267
SettingsStore.getInstance(getContext()).setRemotePropsVersionName(BuildConfig.VERSION_NAME);
267268
RemoteProperties props = mSettingsViewModel.getProps().getValue().get(BuildConfig.VERSION_NAME);
268269
if (props != null) {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,8 @@ public void setWindowPlacement(@NonNull Windows.WindowPlacement aPlacement) {
672672
GleanMetricsService.activePlacementEvent(mWindowPlacement.getValue(), false);
673673
}
674674
mWindowPlacement = aPlacement;
675+
mViewModel.setWidth(mWidgetPlacement.width);
676+
mViewModel.setHeight(mWidgetPlacement.height);
675677
mViewModel.setPlacement(mWindowPlacement);
676678
if (mActive) {
677679
TelemetryWrapper.activePlacementEvent(mWindowPlacement.getValue(), true);
@@ -943,6 +945,8 @@ public void restoreBeforeFullscreenPlacement() {
943945
mWindowPlacement = mWindowPlacementBeforeFullscreen;
944946
mWidgetPlacement.copyFrom(mPlacementBeforeFullscreen);
945947
mWidgetPlacement.composited = composited;
948+
mViewModel.setWidth(mWidgetPlacement.width);
949+
mViewModel.setHeight(mWidgetPlacement.height);
946950
}
947951

948952
public WidgetPlacement getBeforeFullscreenPlacement() {
@@ -955,6 +959,8 @@ public void saveBeforeResizePlacement() {
955959

956960
public void restoreBeforeResizePlacement() {
957961
mWidgetPlacement.copyFrom(mPlacementBeforeResize);
962+
mViewModel.setWidth(mWidgetPlacement.width);
963+
mViewModel.setHeight(mWidgetPlacement.height);
958964
}
959965

960966
public WidgetPlacement getBeforeResizePlacement() {

0 commit comments

Comments
 (0)