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

Fixes #3052 Avoid double fullscreen call #3060

Merged
bluemarvin merged 1 commit into from
Mar 27, 2020
Merged

Fixes #3052 Avoid double fullscreen call #3060

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 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 @@ -415,7 +415,6 @@ public void releaseWidget() {
getSession().exitFullScreen();
}
mAttachedWindow.restoreBeforeFullscreenPlacement();
mAttachedWindow.setIsFullScreen(false);
mWidgetManager.popBackHandler(mFullScreenBackHandler);
}

Expand Down Expand Up @@ -557,7 +556,7 @@ protected void onDraw(Canvas canvas) {

private void enterFullScreenMode() {
mWidgetManager.pushBackHandler(mFullScreenBackHandler);
mAttachedWindow.setIsFullScreen(true);

AnimationHelper.fadeIn(mBinding.navigationBarFullscreen.fullScreenModeContainer, AnimationHelper.FADE_ANIMATION_DURATION, null);

AnimationHelper.fadeOut(mBinding.navigationBarNavigation.navigationBarContainer, 0, null);
Expand Down Expand Up @@ -610,7 +609,6 @@ private void exitFullScreenMode() {

mWidgetManager.updateWidget(mAttachedWindow);

mAttachedWindow.setIsFullScreen(false);
mWidgetManager.popBackHandler(mFullScreenBackHandler);

AnimationHelper.fadeIn(mBinding.navigationBarNavigation.navigationBarContainer, AnimationHelper.FADE_ANIMATION_DURATION, null);
Expand Down Expand Up @@ -799,16 +797,10 @@ private void closeFloatingMenus() {

// Content delegate

@Override
public void onFullScreen(@NonNull GeckoSession session, boolean aFullScreen) {
mViewModel.setIsFullscreen(aFullScreen);
}

private Observer<ObservableBoolean> mIsFullscreenObserver = isFullScreen -> {
if (isFullScreen.get()) {
if (!mAttachedWindow.isFullScreen()) {
enterFullScreenMode();
}
enterFullScreenMode();

if (mAttachedWindow.isResizing()) {
exitResizeMode(ResizeAction.KEEP_SIZE);
}
Expand Down
12 changes: 7 additions & 5 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 @@ -130,7 +130,6 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
private WidgetPlacement mPlacementBeforeFullscreen;
private WidgetPlacement mPlacementBeforeResize;
private boolean mIsResizing;
private boolean mIsFullScreen;
private boolean mAfterFirstPaint;
private boolean mCaptureOnPageStop;
private PromptDelegate mPromptDelegate;
Expand Down Expand Up @@ -192,7 +191,6 @@ private void initialize(Context aContext) {
mPlacementBeforeFullscreen = new WidgetPlacement(aContext);
mPlacementBeforeResize = new WidgetPlacement(aContext);
mIsResizing = false;
mIsFullScreen = false;
initializeWidgetPlacement(mWidgetPlacement);
if (mSession.isPrivateMode()) {
mWidgetPlacement.clearColor = ViewUtils.ARGBtoRGBA(getContext().getColor(R.color.window_private_clear_color));
Expand Down Expand Up @@ -889,8 +887,7 @@ public boolean isResizing() {
}

public void setIsFullScreen(boolean isFullScreen) {
if (isFullScreen != mIsFullScreen) {
mIsFullScreen = isFullScreen;
if (mViewModel.getIsFullscreen().getValue().get() != isFullScreen) {
mViewModel.setIsFullscreen(isFullScreen);
for (WindowListener listener: mListeners) {
listener.onFullScreen(this, isFullScreen);
Expand All @@ -899,7 +896,7 @@ public void setIsFullScreen(boolean isFullScreen) {
}

public boolean isFullScreen() {
return mIsFullScreen;
return mViewModel.getIsFullscreen().getValue().get();
}

public void addWindowListener(WindowListener aListener) {
Expand Down Expand Up @@ -1554,6 +1551,11 @@ private void hideContextMenus() {

// GeckoSession.ContentDelegate

@Override
public void onFullScreen(@NonNull GeckoSession session, boolean aFullScreen) {
setIsFullScreen(aFullScreen);
}

@Override
public void onContextMenu(GeckoSession session, int screenX, int screenY, ContextElement element) {
if (element.type == ContextElement.TYPE_VIDEO) {
Expand Down