From 915b1ccf2eae7f37e51bbbd00f7a12e4bc83e364 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 24 May 2025 18:55:52 +0900
Subject: [PATCH] :art:

---
 .../components/MkWatermarkEditorDialog.padding.vue  |  2 +-
 .../src/components/MkWatermarkEditorDialog.vue      | 13 +++++--------
 packages/frontend/src/pages/settings/drive.vue      |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/src/components/MkWatermarkEditorDialog.padding.vue b/packages/frontend/src/components/MkWatermarkEditorDialog.padding.vue
index 7451d09b5f..374dd8fa5b 100644
--- a/packages/frontend/src/components/MkWatermarkEditorDialog.padding.vue
+++ b/packages/frontend/src/components/MkWatermarkEditorDialog.padding.vue
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<g fill-rule="evenodd">
 					<rect x="21.709" y="14.787" width="120" height="80" fill="var(--MI_THEME-bg)" stop-color="#000000" stroke-dasharray="1.1384, 3.4152" stroke-width="1.1384" style="mix-blend-mode:normal" />
 					<rect x="21.709" y="14.787" width="120" height="80" fill="url(#pattern5942)" stop-color="#000000" stroke-dasharray="1.1384, 3.4152" stroke-width="1.1384" style="mix-blend-mode:normal" />
-					<rect x="47.101" y="40.105" width="69.216" height="29.364" ry="5.3019" fill="var(--MI_THEME-accentDarken)" stop-color="#000000" stroke-dasharray="1.13855, 3.41565" stroke-width="1.1386" />
+					<rect x="47.101" y="40.105" width="69.216" height="29.364" ry="5.3019" fill="var(--MI_THEME-accent)" stop-color="#000000" stroke-dasharray="1.13855, 3.41565" stroke-width="1.1386" />
 				</g>
 				<g fill="none" stroke="var(--MI_THEME-error)">
 					<path v-if="props.arrow === 'top'" d="m81.709 16.167 2e-6 22.601" marker-end="url(#Arrow3)" marker-start="url(#Arrow3)" stop-color="#000000" stroke-width="1.3038" />
diff --git a/packages/frontend/src/components/MkWatermarkEditorDialog.vue b/packages/frontend/src/components/MkWatermarkEditorDialog.vue
index 547737b0a9..a51428f437 100644
--- a/packages/frontend/src/components/MkWatermarkEditorDialog.vue
+++ b/packages/frontend/src/components/MkWatermarkEditorDialog.vue
@@ -109,9 +109,9 @@ import XAnchorSelector from '@/components/MkWatermarkEditorDialog.anchor.vue';
 import XPaddingView from '@/components/MkWatermarkEditorDialog.padding.vue';
 
 import * as os from '@/os.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
 import { i18n } from '@/i18n.js';
-import { selectFile } from '@/utility/select-file.js';
+import { selectFile } from '@/utility/drive.js';
 import { applyWatermark, canApplyWatermark } from '@/utility/watermark.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 
@@ -133,7 +133,7 @@ function cancel() {
 //#endregion
 
 //#region 設定
-const watermarkConfig = ref<WatermarkUserConfig>(defaultStore.state.watermarkConfig ?? {
+const watermarkConfig = ref<WatermarkUserConfig>(prefer.s.watermarkConfig ?? {
 	opacity: 0.2,
 	repeat: true,
 	rotate: 15,
@@ -202,7 +202,7 @@ const paddingBottom = computed({
 
 function save() {
 	if (canApplyWatermark(watermarkConfig.value)) {
-		defaultStore.set('watermarkConfig', watermarkConfig.value);
+		prefer.commit('watermarkConfig', watermarkConfig.value);
 	} else {
 		os.alert({
 			type: 'warning',
@@ -251,10 +251,7 @@ const friendlyFileName = computed<string>(() => {
 });
 
 function chooseFile(ev: MouseEvent) {
-	selectFile(ev.currentTarget ?? ev.target, {
-		label: i18n.ts.selectFile,
-		dontUseWatermark: true,
-	}).then((file) => {
+	selectFile(ev.currentTarget ?? ev.target, i18n.ts.selectFile).then((file) => {
 		if (!file.type.startsWith('image')) {
 			os.alert({
 				type: 'warning',
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index eb0fffc30f..5763e3a33b 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #icon><i class="ti ti-ripple"></i></template>
 					<template #label>{{ i18n.ts.watermark }}</template>
 
-					<div>
+					<div class="_gaps_m">
 						<div class="_gaps">
 							<MkInfo>{{ i18n.ts.useWatermarkInfo }}</MkInfo>