Merge pull request #1209 from NicoPennec/fix/preview

[preview] fix comparison mode and annotation layer
cgwire · Oct 5, 2023 · 1323da9 · 1323da9
2 parents 649b78d + aec1bbb
commit 1323da9
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 126 deletions.
diff --git a/src/components/mixins/annotation.js b/src/components/mixins/annotation.js
@@ -504,22 +504,22 @@ export const annotationMixin = {
       let path, text
       let scaleMultiplierX = 1
       let scaleMultiplierY = 1
-      if (annotation && annotation.width) {
-        scaleMultiplierX = this.fabricCanvas.width / annotation.width
-        scaleMultiplierY = this.fabricCanvas.width / annotation.width
+      if (annotation?.width) {
+        scaleMultiplierX = canvas.width / annotation.width
+        scaleMultiplierY = canvas.width / annotation.width
       }
-      if (annotation && annotation.height) {
-        scaleMultiplierY = this.fabricCanvas.height / annotation.height
+      if (annotation?.height) {
+        scaleMultiplierY = canvas.height / annotation.height
       }
       const canvasWidth = obj.canvasWidth || annotation.width
       const canvasHeight = obj.canvasHeight
 
       if (canvasWidth) {
-        scaleMultiplierX = this.fabricCanvas.width / canvasWidth
-        scaleMultiplierY = this.fabricCanvas.width / canvasWidth
+        scaleMultiplierX = canvas.width / canvasWidth
+        scaleMultiplierY = canvas.width / canvasWidth
       }
       if (canvasHeight) {
-        scaleMultiplierY = this.fabricCanvas.height / canvasHeight
+        scaleMultiplierY = canvas.height / canvasHeight
       }
 
       const base = {

diff --git a/src/components/mixins/fullscreen.js b/src/components/mixins/fullscreen.js
@@ -34,7 +34,7 @@ export const fullScreenMixin = {
 
     documentExitFullScreen() {
       if (document.exitFullscreen) {
-        document.exitFullscreen()
+        return document.exitFullscreen()
       } else if (document.mozCancelFullScreen) {
         document.mozCancelFullScreen()
       } else if (document.webkitCancelFullScreen) {

diff --git a/src/components/previews/BrowsingBar.vue b/src/components/previews/BrowsingBar.vue
@@ -143,5 +143,6 @@ export default {
 
 .current-index {
   cursor: pointer;
+  white-space: nowrap;
 }
 </style>
diff --git a/src/components/previews/PictureViewer.vue b/src/components/previews/PictureViewer.vue
@@ -222,15 +222,7 @@ export default {
     },
 
     onWindowResize() {
-      const now = new Date().getTime()
-      this.lastCall = this.lastCall || 0
-      if (now - this.lastCall > 600) {
-        this.lastCall = now
-        this.$nextTick(this.resetPicture)
-        setTimeout(() => {
-          this.resetPicture()
-        }, 400)
-      }
+      this.resetPicture()
     },
 
     // Configuration