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

Fixes #3607 Fixes #3606 What's new fixes #3614

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Fixes #3607 Fixes #3606 What's new fixes #3614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7edf0
Update viewmodel size when placement is updates
keianhzo Jul 3, 2020
119b323
Request focus when what's new is clicked
keianhzo Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ private void updateUI() {
});

mBinding.navigationBarNavigation.whatsNew.setOnClickListener(v -> {
v.requestFocusFromTouch();
SettingsStore.getInstance(getContext()).setRemotePropsVersionName(BuildConfig.VERSION_NAME);
RemoteProperties props = mSettingsViewModel.getProps().getValue().get(BuildConfig.VERSION_NAME);
if (props != null) {
Expand Down
6 changes: 6 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,8 @@ public void setWindowPlacement(@NonNull Windows.WindowPlacement aPlacement) {
GleanMetricsService.activePlacementEvent(mWindowPlacement.getValue(), false);
}
mWindowPlacement = aPlacement;
mViewModel.setWidth(mWidgetPlacement.width);
mViewModel.setHeight(mWidgetPlacement.height);
mViewModel.setPlacement(mWindowPlacement);
if (mActive) {
TelemetryWrapper.activePlacementEvent(mWindowPlacement.getValue(), true);
Expand Down Expand Up @@ -943,6 +945,8 @@ public void restoreBeforeFullscreenPlacement() {
mWindowPlacement = mWindowPlacementBeforeFullscreen;
mWidgetPlacement.copyFrom(mPlacementBeforeFullscreen);
mWidgetPlacement.composited = composited;
mViewModel.setWidth(mWidgetPlacement.width);
mViewModel.setHeight(mWidgetPlacement.height);
}

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

public void restoreBeforeResizePlacement() {
mWidgetPlacement.copyFrom(mPlacementBeforeResize);
mViewModel.setWidth(mWidgetPlacement.width);
mViewModel.setHeight(mWidgetPlacement.height);
}

public WidgetPlacement getBeforeResizePlacement() {
Expand Down