Merge pull request #361 from ldgallery/oz-fix-txt-scroll

viewer: cannot scroll in text viewer

5 files changed, 22 insertions, 27 deletions

diff --git a/viewer/package.json b/viewer/package.json
index 36c35fb..a0e5953 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -21,7 +21,7 @@
     "pinia": "2.0.23",
     "v-lazy-image": "2.1.1",
     "vue": "3.2.41",
-    "vue-dragscroll": "4.0.4",
+    "vue-dragscroll": "4.0.5",
     "vue-i18n": "9.1.10",
     "vue-router": "4.1.6"
   },
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 30bfe97..5cac863 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -128,6 +128,14 @@ function validateSpashScreen() {
     left: var(--layout-left);
     z-index: 3;
     overflow-x: hidden;
+
+    // Forbid overflow when resizing.
+    // Necessary for the resize handle to be selectable on qutebrowser.
+    max-width: calc(100% - var(--layout-left) - $scrollbar-width);
+    margin: 0 auto; // Center
+    resize: horizontal;
+    // ---
+
     &:focus {
       outline: none;
     }
diff --git a/viewer/src/views/item_handlers/PictureViewer.vue b/viewer/src/views/item_handlers/PictureViewer.vue
index 74b978f..d091f19 100644
--- a/viewer/src/views/item_handlers/PictureViewer.vue
+++ b/viewer/src/views/item_handlers/PictureViewer.vue
@@ -18,12 +18,14 @@
 -->
 
 <template>
+  <!-- @dragstart.prevent stops Drag 'n Drop of pictures on FireFox -->
   <div
     ref="containerElement"
     v-dragscroll
     class="scrollbar"
     :class="$style.pictureContainer"
     @dblclick="uiStore.toggleFullscreen()"
+    @dragstart.prevent="false"
   >
     <img
       v-if="!error"
diff --git a/viewer/src/views/item_handlers/PlainTextViewer.vue b/viewer/src/views/item_handlers/PlainTextViewer.vue
index 2ab429a..96c4d4c 100644
--- a/viewer/src/views/item_handlers/PlainTextViewer.vue
+++ b/viewer/src/views/item_handlers/PlainTextViewer.vue
@@ -19,17 +19,12 @@
 -->
 
 <template>
-  <!-- Outer div necessary for the resize handle to appear on Firefox. -->
-  <div
+  <pre
+    v-if="isFinished"
     :class="$style.content"
-    class="fill"
-  >
-    <pre
-      v-if="isFinished"
-      v-text="data"
-    />
-    <LdLoading v-else />
-  </div>
+    v-text="data"
+  />
+  <LdLoading v-else />
 </template>
 
 <script setup lang="ts">
@@ -51,19 +46,9 @@ const { isFinished, data } = useFetch(itemResourceUrl).text();
 @import "~@/assets/scss/theme";
 
 .content {
-  display: flex;
-  justify-content: center;
+  margin: 1em;
   background: $viewer-text-background;
   color: $viewer-text;
-
-  > pre {
-    width: 100%;
-    max-width: 100%; // Forbid overflow when resizing.
-    margin: 1em; // Necessary for the resize handle to be selectable on qutebrowser.
-    border: none;
-    white-space: pre-wrap;
-    resize: horizontal; // Allow the user to adjust the width of the text view for easier column reading.
-    overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
-  }
+  white-space: pre-wrap;
 }
 </style>
diff --git a/viewer/yarn.lock b/viewer/yarn.lock
index 5715dfe..b45d4a6 100644
--- a/viewer/yarn.lock
+++ b/viewer/yarn.lock
@@ -6821,10 +6821,10 @@ vue-demi@*:
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
   integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
 
-vue-dragscroll@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/vue-dragscroll/-/vue-dragscroll-4.0.4.tgz#761e77f787d78de321f905dfb44cd6fe10a09101"
-  integrity sha512-2VaDPzvVJKR0FxOwIt9ot53tpVG3K6Qcb7LFOHQ869WVBXWuVcJTXyBRKyrUACY82O3kIdPvj/Kzsw4ZeBkL0w==
+vue-dragscroll@4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/vue-dragscroll/-/vue-dragscroll-4.0.5.tgz#b07bbbc0300a5dee892bc48b000942a93d258cd8"
+  integrity sha512-1V4/2rUlNTM8vYC6/y2yfjKjOynuCfp1VRpj+IOGCcj8FWl4/3FMs9GBUJShd5mLoD4BvhY1xveezeuD+9i/mw==
   dependencies:
     vue "^3.2.37"