diff options
author | pacien | 2020-04-26 06:02:33 +0200 |
---|---|---|
committer | pacien | 2020-04-26 17:49:05 +0200 |
commit | b86d96f2ed5dd4f17b047e8aba22512400484bb3 (patch) | |
tree | 57f64f8d296e1c9f8697a6e4af8d7669287d714c /viewer/src/components | |
parent | add23cc6e83a677f8e747348a2429050efe8c515 (diff) | |
download | ldgallery-b86d96f2ed5dd4f17b047e8aba22512400484bb3.tar.gz |
viewer/LdPicture: implement mousewheel zoom
GitHub: closes #153
Diffstat (limited to 'viewer/src/components')
-rw-r--r-- | viewer/src/components/LdPicture.vue | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue index 3170c81..622165d 100644 --- a/viewer/src/components/LdPicture.vue +++ b/viewer/src/components/LdPicture.vue | |||
@@ -19,31 +19,37 @@ | |||
19 | 19 | ||
20 | <template> | 20 | <template> |
21 | <div | 21 | <div |
22 | ref="containerElement" | ||
22 | v-dragscroll | 23 | v-dragscroll |
23 | class="scrollbar" | 24 | class="scrollbar ld-picture-container" |
24 | :class="{'fit-to-screen': !$uiStore.fullscreen, 'original-size': $uiStore.fullscreen}" | ||
25 | @click.capture="e => dragScrollClickFix.onClickCapture(e)" | 25 | @click.capture="e => dragScrollClickFix.onClickCapture(e)" |
26 | @click="$uiStore.toggleFullscreen()" | 26 | @dblclick="$uiStore.toggleFullscreen()" |
27 | @dragstart.prevent | ||
27 | @dragscrollstart="dragScrollClickFix.onDragScrollStart()" | 28 | @dragscrollstart="dragScrollClickFix.onDragScrollStart()" |
28 | @dragscrollend="dragScrollClickFix.onDragScrollEnd()" | 29 | @dragscrollend="dragScrollClickFix.onDragScrollEnd()" |
29 | > | 30 | > |
30 | <v-lazy-image | 31 | <v-lazy-image |
32 | ref="imageElement" | ||
31 | :src="pictureSrc(picture.properties.resource)" | 33 | :src="pictureSrc(picture.properties.resource)" |
34 | class="ld-picture-element" | ||
32 | :class="{'slow-loading': Boolean(slowLoadingStyle)}" | 35 | :class="{'slow-loading': Boolean(slowLoadingStyle)}" |
33 | :style="slowLoadingStyle" | 36 | :style="slowLoadingStyle" |
34 | @load="clearSlowLoading" | 37 | @load="lazyImageLoaded" |
35 | /> | 38 | /> |
36 | <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" /> | 39 | <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" /> |
37 | </div> | 40 | </div> |
38 | </template> | 41 | </template> |
39 | 42 | ||
40 | <script lang="ts"> | 43 | <script lang="ts"> |
41 | import { Component, Vue, Prop } from "vue-property-decorator"; | 44 | import { Component, Vue, Prop, Ref } from "vue-property-decorator"; |
45 | import LdZoom from "@/services/ldzoom"; | ||
42 | import DragScrollClickFix from "@/services/dragscrollclickfix"; | 46 | import DragScrollClickFix from "@/services/dragscrollclickfix"; |
43 | 47 | ||
44 | @Component | 48 | @Component |
45 | export default class LdPicture extends Vue { | 49 | export default class LdPicture extends Vue { |
46 | @Prop({ required: true }) readonly picture!: Gallery.Picture; | 50 | @Prop({ required: true }) readonly picture!: Gallery.Picture; |
51 | @Ref() readonly containerElement!: HTMLDivElement; | ||
52 | @Ref() readonly imageElement!: any; // FIXME: no typedef for v-lazy-image | ||
47 | 53 | ||
48 | readonly SLOW_LOADING_TIMEOUT_MS: number = 1500; | 54 | readonly SLOW_LOADING_TIMEOUT_MS: number = 1500; |
49 | readonly dragScrollClickFix = new DragScrollClickFix(); | 55 | readonly dragScrollClickFix = new DragScrollClickFix(); |
@@ -60,6 +66,11 @@ export default class LdPicture extends Vue { | |||
60 | this.clearSlowLoading(); | 66 | this.clearSlowLoading(); |
61 | } | 67 | } |
62 | 68 | ||
69 | lazyImageLoaded() { | ||
70 | this.clearSlowLoading(); | ||
71 | new LdZoom(this.containerElement, this.imageElement.$el, 10, 1 / 5).install(); | ||
72 | } | ||
73 | |||
63 | clearSlowLoading() { | 74 | clearSlowLoading() { |
64 | if (this.timer) clearTimeout(this.timer); | 75 | if (this.timer) clearTimeout(this.timer); |
65 | this.timer = null; | 76 | this.timer = null; |
@@ -85,13 +96,17 @@ export default class LdPicture extends Vue { | |||
85 | <style lang="scss"> | 96 | <style lang="scss"> |
86 | @import "~@/assets/scss/theme.scss"; | 97 | @import "~@/assets/scss/theme.scss"; |
87 | 98 | ||
88 | .ld-picture-loader { | 99 | .ld-picture-container { |
89 | position: relative; | 100 | height: 100%; |
90 | & .loading-background { | 101 | } |
91 | background: none !important; | 102 | |
92 | } | 103 | .ld-picture-element { |
104 | max-width: unset; | ||
105 | max-height: unset; | ||
106 | cursor: grab; | ||
93 | } | 107 | } |
94 | img.slow-loading { | 108 | |
109 | .slow-loading { | ||
95 | background-repeat: no-repeat; | 110 | background-repeat: no-repeat; |
96 | background-position: center; | 111 | background-position: center; |
97 | background-size: contain; | 112 | background-size: contain; |
@@ -99,25 +114,11 @@ img.slow-loading { | |||
99 | background-blend-mode: soft-light; | 114 | background-blend-mode: soft-light; |
100 | opacity: 1 !important; | 115 | opacity: 1 !important; |
101 | } | 116 | } |
102 | .fit-to-screen { | 117 | |
103 | display: flex; | 118 | .ld-picture-loader { |
104 | justify-content: space-around; | 119 | position: relative; |
105 | height: 100%; | 120 | & .loading-background { |
106 | & > img { | 121 | background: none !important; |
107 | object-fit: contain; | ||
108 | cursor: zoom-in; | ||
109 | } | ||
110 | } | ||
111 | .original-size { | ||
112 | display: block; | ||
113 | text-align: center; | ||
114 | cursor: grab; | ||
115 | height: 100%; | ||
116 | & > img { | ||
117 | max-width: unset; | ||
118 | max-height: unset; | ||
119 | object-fit: none; | ||
120 | cursor: zoom-out; | ||
121 | } | 122 | } |
122 | } | 123 | } |
123 | </style> | 124 | </style> |