From 484db037c001f6b5a09672edb6c0a19d61b36b86 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 13 Nov 2021 00:51:59 +0100
Subject: [PATCH] use event bus

---
 src/csui/PlayerUiComponent.vue                |   4 +-
 .../AlignmentOptionsControlComponent.vue      | 104 +++++++++---------
 src/csui/PlayerUiPanels/VideoSettings.vue     |  43 +++++---
 src/ext/lib/uwui/PlayerNotificationUI.js      |   2 +-
 src/ext/lib/uwui/PlayerUI.js                  |   3 +-
 src/ext/lib/uwui/UI.js                        |   8 +-
 src/ext/lib/video-data/PlayerData.ts          |   2 +-
 src/ext/lib/video-transform/Resizer.ts        |   5 +
 8 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/src/csui/PlayerUiComponent.vue b/src/csui/PlayerUiComponent.vue
index 4aaae25..8ae3dc8 100644
--- a/src/csui/PlayerUiComponent.vue
+++ b/src/csui/PlayerUiComponent.vue
@@ -47,7 +47,7 @@
       <div class="content flex flex-column">
         <!-- autodetection warning -->
 
-        <div class="warning-area">
+        <div v-if="ultrawidify?.videoData?.hasDrm" class="warning-area">
           <div class="warning-box">
             <div>
               <mdicon name="alert" :size="42" />
@@ -64,7 +64,7 @@
           <template v-if="settingsInitialized">
             <VideoSettings
               :settings="settings"
-              :eventBus="eventBus"
+              :eventBus="ultrawidify.eventBus"
             ></VideoSettings>
             <!-- <ResizerDebugPanel :debugData="debugData">
             </ResizerDebugPanel> -->
diff --git a/src/csui/PlayerUiPanels/AlignmentOptionsControlComponent.vue b/src/csui/PlayerUiPanels/AlignmentOptionsControlComponent.vue
index d41540f..ffc425f 100644
--- a/src/csui/PlayerUiPanels/AlignmentOptionsControlComponent.vue
+++ b/src/csui/PlayerUiPanels/AlignmentOptionsControlComponent.vue
@@ -68,84 +68,90 @@ import VideoAlignmentType from '../../common/enums/VideoAlignmentType.enum';
 
 
 export default {
+  props: [
+    'eventBus'
+  ],
   data() {
     return {
       VideoAlignment: VideoAlignmentType
     }
   },
   methods: {
-    align() {
-
+    align(alignmentX, alignmentY) {
+      console.warn('sending set alignment:', {x: alignmentX, y: alignmentY});
+      this.eventBus.send('set-alignment', {x: alignmentX, y: alignmentY})
     }
   }
 }
 </script>
 
-<style lang="scss" scoped>
-.alignment-box {
-  aspect-ratio: 1;
-  width: 100%;
-  min-width: 40px;
-  max-width: 80px;
-
-  display: flex;
-  flex-direction: column;
-
-  .row {
-    flex: 0 0 33%;
+<style lang="scss">
+.uw-ultrawidify-container-root {
+  .alignment-box {
+    aspect-ratio: 1;
+    width: 100%;
+    min-width: 40px;
+    max-width: 80px;
 
     display: flex;
-    flex-direction: row;
-  }
+    flex-direction: column;
 
-  .col {
-    flex: 0 0 33%;
+    .row {
+      flex: 0 0 33%;
 
-    display: flex;
-
-    .alignment-ui {
-      width: 50%;
-      height: 50%;
+      display: flex;
+      flex-direction: row;
     }
 
-    align-items: center;
-    justify-content: center;
+    .col {
+      flex: 0 0 33%;
 
-    &.top  {
-      align-items: flex-start;
+      display: flex;
 
       .alignment-ui {
-        border-top: 3px solid #fff;
+        width: 50%;
+        height: 50%;
       }
-    }
-    &.bottom  {
-      align-items: flex-end;
 
-      .alignment-ui {
-        border-bottom: 3px solid #fff;
+      align-items: center;
+      justify-content: center;
+
+      &.top  {
+        align-items: flex-start;
+
+        .alignment-ui {
+          border-top: 3px solid #fff;
+        }
       }
-    }
-    &.left {
-      justify-content: flex-start;
+      &.bottom  {
+        align-items: flex-end;
 
-      .alignment-ui {
-        border-left: 3px solid #fff;
+        .alignment-ui {
+          border-bottom: 3px solid #fff;
+        }
       }
-    }
-    &.right {
-      justify-content: flex-end;
+      &.left {
+        justify-content: flex-start;
 
-      .alignment-ui {
-        border-right: 3px solid #fff;
+        .alignment-ui {
+          border-left: 3px solid #fff;
+        }
       }
-    }
+      &.right {
+        justify-content: flex-end;
 
-    &.center.ycenter {
+        .alignment-ui {
+          border-right: 3px solid #fff;
+        }
+      }
 
-      .alignment-ui {
-        width: 25%;
-        height: 25%;
-        background-color: #fff;
+      &.center.ycenter {
+
+        .alignment-ui {
+          width: 25%;
+          height: 25%;
+          background-color: #fff;
+        }
       }
     }
   }
diff --git a/src/csui/PlayerUiPanels/VideoSettings.vue b/src/csui/PlayerUiPanels/VideoSettings.vue
index 02b275b..a09e004 100644
--- a/src/csui/PlayerUiPanels/VideoSettings.vue
+++ b/src/csui/PlayerUiPanels/VideoSettings.vue
@@ -120,7 +120,9 @@
       </div>
 
       <div class="flex flex-row">
-        <alignment-options-control-component>
+        <alignment-options-control-component
+          :eventBus="eventBus"
+        >
         </alignment-options-control-component>
       </div>
 
@@ -167,7 +169,7 @@ export default {
     'settings',
     'frame',
     'cropModePersistence',
-    'eventBus'
+    'eventBus',
   ],
   created() {
     this.exec = new ExecAction(this.settings, window.location.hostname);
@@ -238,24 +240,35 @@ export default {
 }
 </script>
 
+<style lang="scss">
+.uw-ultrawidify-container-root {
+  all: revert;
+  * {
+    all: revert;
+  }
+}
+
+</style>
+
 <style lang="scss" src="../../res/css/flex.scss" scoped></style>
 <style lang="scss" src="../res-common/panels.scss" scoped></style>
 <style lang="scss" src="../res-common/common.scss" scoped></style>
 
 <style lang="scss" scoped>
-.b3 {
-  width: 9rem;
-  padding-left: 0.33rem;
-  padding-right: 0.33rem;
+.uw-ultrawidify-container-root {
+  .b3 {
+    width: 9rem;
+    padding-left: 0.33rem;
+    padding-right: 0.33rem;
+  }
+  .input-slider {
+    width: 480px;
+  }
+  .warning-lite {
+    padding-right: 16px;
+    padding-bottom: 16px;
+    padding-top: 8px;
+  }
 }
-.input-slider {
-  width: 480px;
-}
-.warning-lite {
-  padding-right: 16px;
-  padding-bottom: 16px;
-  padding-top: 8px;
-}
-
 
 </style>
diff --git a/src/ext/lib/uwui/PlayerNotificationUI.js b/src/ext/lib/uwui/PlayerNotificationUI.js
index b4c13fa..29eed86 100644
--- a/src/ext/lib/uwui/PlayerNotificationUI.js
+++ b/src/ext/lib/uwui/PlayerNotificationUI.js
@@ -24,7 +24,7 @@ class PlayerNotificationUi extends UI {
       PlayerNotificationUi.getStoreConfig(),
       PlayerNotificationUi.getUiConfig(playerElement),
       PlayerNotificationUi.getCommsConfig(),
-      eventBus
+      { eventBus }
     );
 
     this.settings = settings;
diff --git a/src/ext/lib/uwui/PlayerUI.js b/src/ext/lib/uwui/PlayerUI.js
index 2e5b67d..b4c3c0c 100644
--- a/src/ext/lib/uwui/PlayerUI.js
+++ b/src/ext/lib/uwui/PlayerUI.js
@@ -20,13 +20,14 @@ class PlayerUi extends UI {
     playerElement,
     settings,
     eventBus,
+    videoData
   ) {
     super(
       'ultrawidifyUi',
       PlayerUi.getStoreConfig(),
       PlayerUi.getUiConfig(playerElement),
       PlayerUi.getCommsConfig(),
-      eventBus
+      { eventBus, videoData }
     );
 
     this.settings = settings;
diff --git a/src/ext/lib/uwui/UI.js b/src/ext/lib/uwui/UI.js
index ce8b16b..e633be1 100644
--- a/src/ext/lib/uwui/UI.js
+++ b/src/ext/lib/uwui/UI.js
@@ -14,13 +14,13 @@ class UI {
     storeConfig,
     uiConfig, // {component, parentElement?}
     commsConfig,
-    eventBus
+    ultrawidify, // or, at least, videoData instance + event bus
   ) {
     this.interfaceId = interfaceId;
     this.commsConfig = commsConfig;
     this.storeConfig = storeConfig;
     this.uiConfig = uiConfig;
-    this.eventBus = eventBus;
+    this.ultrawidify = ultrawidify;
 
     this.init();
   }
@@ -71,12 +71,12 @@ class UI {
           app.mixin({
             data() {
               return {
-                eventBus: options.eventBus
+                ultrawidify: options.ultrawidify
               }
             }
           })
         }
-      }, {eventBus: this.eventBus});
+      }, {ultrawidify: this.ultrawidify});
 
     if (this.vuexStore) {
       app.use(this.vuexStore);
diff --git a/src/ext/lib/video-data/PlayerData.ts b/src/ext/lib/video-data/PlayerData.ts
index 252383b..c1f373e 100644
--- a/src/ext/lib/video-data/PlayerData.ts
+++ b/src/ext/lib/video-data/PlayerData.ts
@@ -95,7 +95,7 @@ class PlayerData {
       this.element = this.getPlayer();
 
       this.notificationService = new PlayerNotificationUi(this.element, this.settings, this.eventBus);
-      this.ui = new PlayerUi(this.element, this.settings, this.eventBus);
+      this.ui = new PlayerUi(this.element, this.settings, this.eventBus, this.videoData);
       this.ui.init();
 
       this.dimensions = undefined;
diff --git a/src/ext/lib/video-transform/Resizer.ts b/src/ext/lib/video-transform/Resizer.ts
index 32aee44..ccd9f8f 100644
--- a/src/ext/lib/video-transform/Resizer.ts
+++ b/src/ext/lib/video-transform/Resizer.ts
@@ -591,6 +591,8 @@ class Resizer {
 
     const {realVideoWidth, realVideoHeight, marginX, marginY} = this.computeVideoDisplayedDimensions();
 
+    const {postZoomVideoDimensions, displayedVideoDimensions, crop} = this.computeCroppedAreas(stretchFactors);
+
     // correct any remaining element size discrepencies (applicable only to certain crop strategies!)
     // NOTE: it's possible that we might also need to apply a similar measure for CropPillarbox strategy
     // (but we'll wait for bug reports before doing so).
@@ -605,6 +607,9 @@ class Resizer {
       stretchFactors.yFactor *= autoHeightCompensationFactor;
     }
 
+    const offsetWidth = this.conf.video.offsetWidth;
+    const offsetHeight = this.conf.video.offsetHeight;
+
     const wdiff = this.conf.player.dimensions.width - realVideoWidth;
     const hdiff = this.conf.player.dimensions.height - realVideoHeight;