From 08046ad8864b0ed388fefc4ed63b73aa9125e1f1 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 12 Apr 2023 02:17:26 +0000
Subject: [PATCH] =?UTF-8?q?MkImgWithBlurHash=E3=81=A7ratio=E3=82=92?=
 =?UTF-8?q?=E8=A8=88=E7=AE=97=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkImgWithBlurhash.vue      | 21 ++++++++++++++++++-
 .../frontend/src/components/MkMediaImage.vue  | 17 ++-------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue
index c52fa2299c..28720d9023 100644
--- a/packages/frontend/src/components/MkImgWithBlurhash.vue
+++ b/packages/frontend/src/components/MkImgWithBlurhash.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
+import { onMounted, watch } from 'vue';
 import { decode } from 'blurhash';
 
 const props = withDefaults(defineProps<{
@@ -28,6 +28,8 @@ const props = withDefaults(defineProps<{
 
 const canvas = $shallowRef<HTMLCanvasElement>();
 let loaded = $ref(false);
+let width = $ref(props.width);
+let height = $ref(props.height);
 
 function draw() {
 	if (props.hash == null) return;
@@ -42,6 +44,23 @@ function onLoad() {
 	loaded = true;
 }
 
+watch(() => props.hash, () => {
+	draw();
+});
+
+watch([() => props.width, () => props.height], () => {
+	const ratio = props.width / props.height;
+	if (ratio > 1) {
+		width = Math.round(64 * ratio);
+		height = 64;
+	} else {
+		width = 64;
+		height = Math.round(64 / ratio);
+	}
+}, {
+	immediate: true,
+});
+
 onMounted(() => {
 	draw();
 });
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 14a17eee70..08c0a6a607 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -1,6 +1,6 @@
 <template>
 <div v-if="hide" :class="$style.hidden" @click="hide = false">
-	<ImgWithBlurhash style="filter: brightness(0.5);" :hash="image.blurhash" :title="image.comment" :alt="image.comment" :width="width" :height="height"/>
+	<ImgWithBlurhash style="filter: brightness(0.5);" :hash="image.blurhash" :title="image.comment" :alt="image.comment" :width="image.properties.width" :height="image.properties.height" />
 	<div :class="$style.hiddenText">
 		<div :class="$style.hiddenTextWrapper">
 			<b style="display: block;"><i class="ti ti-alert-triangle"></i> {{ i18n.ts.sensitive }}</b>
@@ -14,7 +14,7 @@
 		:href="image.url"
 		:title="image.name"
 	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :width="width" :height="height" :cover="false"/>
+		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :width="image.properties.width" :height="image.properties.height" :cover="false"/>
 	</a>
 	<div :class="$style.indicators">
 		<div v-if="['image/gif', 'image/apng'].includes(image.type)" :class="$style.indicator">GIF</div>
@@ -39,8 +39,6 @@ const props = defineProps<{
 
 let hide = $ref(true);
 let darkMode = $ref(defaultStore.state.darkMode);
-let width = $ref(64);
-let height = $ref(64);
 
 const url = $computed(() => (props.raw || defaultStore.state.loadRawImages)
 	? props.image.url
@@ -52,17 +50,6 @@ const url = $computed(() => (props.raw || defaultStore.state.loadRawImages)
 // Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
 watch(() => props.image, () => {
 	hide = (defaultStore.state.nsfw === 'force') ? true : props.image.isSensitive && (defaultStore.state.nsfw !== 'ignore');
-
-	if (props.image.properties.width && props.image.properties.height) {
-		const ratio = props.image.properties.width / props.image.properties.height;
-		if (ratio > 1) {
-			width = Math.round(64 * ratio);
-			height = 64;
-		} else {
-			width = 64;
-			height = Math.round(64 / ratio);
-		}
-	}
 }, {
 	deep: true,
 	immediate: true,