Fix Igalia#1698

haanhvu · Jan 30, 2025 · cb6b362 · cb6b362
1 parent 3d33a9e
commit cb6b362
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
@@ -99,6 +99,8 @@ public class NavigationBarWidget extends UIWidget implements WSession.Navigation
     private static final int POPUP_NOTIFICATION_ID = 3;
     private static final int WEB_APP_ADDED_NOTIFICATION_ID = 4;
 
+    private static boolean disableHeadlockForVR;
+
     public interface NavigationListener {
         void onBack();
         void onForward();
@@ -681,6 +683,12 @@ public void onMediaFullScreen(@NonNull WMediaSession mediaSession, boolean aFull
             }
 
             if (mAutoSelectedProjection != VIDEO_PROJECTION_NONE && autoEnter.get()) {
+                SettingsStore settingsStore = SettingsStore.getInstance(getContext());
+                if (settingsStore.isHeadLockEnabled() == true) {
+                    settingsStore.setHeadLockEnabled(false);
+                    disableHeadlockForVR = true;
+                }
+
                 mViewModel.setAutoEnteredVRVideo(true);
                 postDelayed(() -> enterVRVideo(mAutoSelectedProjection), 300);
             } else {
@@ -696,6 +704,9 @@ public void onMediaFullScreen(@NonNull WMediaSession mediaSession, boolean aFull
 
             if (isInVRVideo()) {
                 exitVRVideo();
+                if (disableHeadlockForVR == true) {
+                    SettingsStore.getInstance(getContext()).setHeadLockEnabled(true);
+                }
             }
         }
    }
@@ -755,11 +766,22 @@ private void enterFullScreenMode() {
                         exitVRVideo();
                         mAttachedWindow.reCenterFrontWindow();
                     } else {
+                        SettingsStore settingsStore = SettingsStore.getInstance(getContext());
+                        if (settingsStore.isHeadLockEnabled() == true) {
+                            settingsStore.setHeadLockEnabled(false);
+                            disableHeadlockForVR = true;
+                        }
+
                         // Reproject while reproducing VRVideo
                         mWidgetManager.showVRVideo(mAttachedWindow.getHandle(), projection);
                     }
                     closeFloatingMenus();
                 } else {
+                    SettingsStore settingsStore = SettingsStore.getInstance(getContext());
+                    if (settingsStore.isHeadLockEnabled() == true) {
+                        settingsStore.setHeadLockEnabled(false);
+                        disableHeadlockForVR = true;
+                    }
                     enterVRVideo(projection);
                 }
             });
@@ -996,6 +1018,10 @@ private void exitVRVideo() {
         mWidgetManager.setCylinderDensityForce(mSavedCylinderDensity);
         // Reposition UI in front of the user when exiting a VR video.
         mWidgetManager.recenterUIYaw(WidgetManagerDelegate.YAW_TARGET_ALL);
+
+        if (disableHeadlockForVR == true) {
+            SettingsStore.getInstance(getContext()).setHeadLockEnabled(true);
+        }
     }
 
     private void setResizePreset(float aMultiplier) {