src/common/interfaces/SettingsInterface.ts

@@ -214,8 +214,6 @@ interface SettingsInterface {
   ui: {
     inPlayer: {
       enabled: boolean,
-      enabledFullscreenOnly: boolean,
-      popupAlignment: 'left' | 'right',
       minEnabledWidth: number,                 // don't show UI if player is narrower than % of screen width
       activation: 'trigger-zone' | 'player',   // what needs to be hovered in order for UI to be visible
       triggerZoneDimensions: {                 // how large the trigger zone is (relative to player size)

src/csui/PlayerOverlay.vue

@@ -134,7 +134,6 @@
       :logger="logger"
       :in-player="!isGlobal"
       :site="site"
-      :defaultTab="defaultWindowTab"
       @close="uwWindowVisible = false"
       @preventClose="(event) => uwWindowFadeOutDisabled = event"
     ></PlayerUIWindow>
@@ -221,9 +220,10 @@ export default {
       statusFlags: {
         hasDrm: undefined,
       },
-      defaultWindowTab: 'videoSettings',
 
       saveState: {},
+
+      selectedTab: 'videoSettings',
     };
   },
   computed: {
@@ -406,13 +406,10 @@ export default {
       this.triggerZoneActive = active;
     },
 
-    showUwWindow(tab) {
+    showUwWindow() {
-      this.defaultWindowTab = tab; // can be undefined
-
       this.uwWindowFadeOut = false;
       this.uwWindowVisible = true;
       this.uwTriggerZoneVisible = false;
-      this.allowContextMenuHide();
 
       // refresh DRM status
       this.eventBus.send('get-drm-status');
@@ -450,6 +447,10 @@ export default {
 
     handleBusTunnelIn(payload) {
       this.eventBus.send(payload.action, payload.config, payload.routingData);
+    },
+
+    selectTab(tab) {
+      this.selectedTab = tab;
     }
   }
 }

src/csui/src/PlayerUIWindow.vue

@@ -200,8 +200,7 @@ export default {
     'eventBus',
     'logger',
     'in-player',
-    'site',
+    'site'
-    'defaultTab'
   ],
   computed: {
     // LPT: NO ARROW FUNCTIONS IN COMPUTED,
@@ -212,9 +211,6 @@ export default {
     }
   },
   created() {
-    if (this.defaultTab) {
-      this.selectedTab = this.defaultTab;
-    }
     this.siteSettings = this.settings.getSiteSettings(this.site);
     this.tabs.find(x => x.id === 'changelog').highlight = !this.settings.active.whatsNewChecked;
 

src/ext/conf/ExtConfPatches.ts

@@ -169,10 +169,8 @@ const ExtensionConfPatch = [
       userOptions.ui = {
         inPlayer: {
           enabled: true, // enable by default on new installs
-          enabledFullscreenOnly: false,
           minEnabledWidth: 0.75,
           activation: 'player',
-          popupAlignment: 'left',
           triggerZoneDimensions: {
             width: 0.5,
             height: 0.5,

src/ext/conf/ExtensionConf.ts

@@ -160,10 +160,8 @@ const ExtensionConf: SettingsInterface = {
   ui: {
     inPlayer: {
       enabled: true, // enable by default on new installs
-      enabledFullscreenOnly: false,
       minEnabledWidth: 0.75,
       activation: 'player',
-      popupAlignment: 'left',
       triggerZoneDimensions: {
         width: 0.5,
         height: 0.5,