wip

locales/index.d.ts

@@ -5605,13 +5605,17 @@ export interface Locale extends ILocale {
      * 技術的なお問い合わせの際に、以下の情報を併記すると問題の解決に役立つことがあります。
      */
     "deviceInfoDescription": string;
+    /**
+     * フレーム
+     */
+    "frame": string;
     "_imageFrameEditor": {
         /**
-         * ラベルの編集
+         * フレームの編集
          */
         "title": string;
         /**
-         * フレームの幅
+         * フチの幅
          */
         "borderThickness": string;
         /**

packages/frontend/src/composables/use-uploader.ts

@@ -575,21 +575,21 @@ export function useUploader(options: {
 
 		const exif = await ExifReader.load(await item.file.arrayBuffer());
 
-		const labelRenderer = new ImageFrameRenderer({
+		const frameRenderer = new ImageFrameRenderer({
 			canvas: canvas,
 			image: await window.createImageBitmap(preprocessedFile),
 			exif,
 		});
-		//await labelRenderer.update({
+		//await frameRenderer.update({
 		//	title: `${meta_model} + ${meta_lensModel}`,
 		//	text: `${date}   ${meta_mm}mm   f/${meta_f}   ${meta_s}s   ISO${meta_iso}`,
 		//});
-		await labelRenderer.updateAndRender({
+		await frameRenderer.updateAndRender({
 			title: 'aaaaaaaaaaaaa',
 			text: 'bbbbbbbbbbbbbbbbbbbb',
 		});
 
-		labelRenderer.render();
+		frameRenderer.render();
 
 		preprocessedFile = await new Promise<Blob>((resolve) => {
 			canvas.toBlob((blob) => {
@@ -597,7 +597,7 @@ export function useUploader(options: {
 					throw new Error('Failed to convert canvas to blob');
 				}
 				resolve(blob);
-				labelRenderer.destroy();
+				frameRenderer.destroy();
 			}, 'image/png');
 		});
 

packages/frontend/src/pages/settings/drive.vue

@@ -346,7 +346,7 @@ async function addImageFramePreset() {
 	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkImageFrameEditorDialog.vue').then(x => x.default), {
 	}, {
 		ok: (preset: any) => {
-			//prefer.commit('imageLabelPresets', [...prefer.s.imageLabelPresets, preset]);
+			//prefer.commit('imageFramePresets', [...prefer.s.imageFramePresets, preset]);
 		},
 		closed: () => dispose(),
 	});

packages/frontend/src/utility/image-effector/fxs/frame.ts

@@ -4,7 +4,7 @@
  */
 
 import { defineImageEffectorFx } from '../ImageEffector.js';
-import shader from './label.glsl';
+import shader from './frame.glsl';
 
 export const FX_frame = defineImageEffectorFx({
 	id: 'frame',