Skip to content

feat(ui): add frame aspect ratio, orientation, and alignment controls #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amemya merged 1 commit into from
May 22, 2026
Merged

feat(ui): add frame aspect ratio, orientation, and alignment controls #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 61 additions & 3 deletions frontend/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ body {
text-align: left;
}

.input-group input {
.input-group input,
.input-group select {
background-color: var(--input-bg);
border: 1px solid var(--input-border);
color: var(--text-primary);
Expand All @@ -262,7 +263,18 @@ body {
-webkit-user-select: text;
}

.input-group input:focus {
.input-group select {
appearance: none;
-webkit-appearance: none;
background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%239aa0a6' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
background-repeat: no-repeat;
background-position: right 0.7rem center;
background-size: 1em;
padding-right: 2rem;
}

.input-group input:focus,
.input-group select:focus {
border-color: var(--accent-color);
background-color: #252525;
}
Expand Down Expand Up @@ -311,4 +323,50 @@ body {
opacity: 0;
transform: translateY(-10px);
}
}
}
/* Segmented Control */
.segmented-control {
display: flex;
background-color: var(--input-bg);
border: 1px solid var(--input-border);
border-radius: 6px;
padding: 2px;
}

.segmented-control .segment {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
background: transparent;
border: none;
color: var(--text-secondary);
padding: 0.4rem 0;
font-size: 0.75rem;
font-weight: 500;
cursor: pointer;
border-radius: 4px;
transition: all 0.2s ease;
font-family: inherit;
--wails-draggable: no-drag;
}

.segmented-control .segment:hover {
color: var(--text-primary);
}

.segmented-control .segment.active {
background-color: #3e3e42;
color: white;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
}

.segmented-control .segment svg {
opacity: 0.8;
}

.segmented-control.disabled {
opacity: 0.5;
pointer-events: none;
}
177 changes: 152 additions & 25 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useRef, useEffect } from 'react';
import { useState, useRef, useEffect, useCallback } from 'react';
import './App.css';
import { OpenImage, SaveImage } from '../wailsjs/go/main/App';
import { WindowToggleMaximise, Environment } from '../wailsjs/runtime/runtime';
Expand Down Expand Up @@ -36,6 +36,12 @@ function App() {
const toastTimerRef = useRef<number | null>(null);
const toastRafRef = useRef<number | null>(null);

const [aspectRatioPreset, setAspectRatioPreset] = useState<string>("4300:3618");
const [customRatioW, setCustomRatioW] = useState<number>(4300);
const [customRatioH, setCustomRatioH] = useState<number>(3618);
const [orientation, setOrientation] = useState<"landscape" | "portrait">("landscape");
const [alignment, setAlignment] = useState<"top" | "center">("top");

const showToast = (message: string) => {
if (toastTimerRef.current !== null) {
window.clearTimeout(toastTimerRef.current);
Expand Down Expand Up @@ -117,6 +123,7 @@ function App() {
setSourceMimeType(result.mimeType || "");

setImageObj(img);
setOrientation(img.height > img.width ? "portrait" : "landscape");
setImageLoaded(true);
resolve();
};
Expand All @@ -135,25 +142,58 @@ function App() {
}
};

useEffect(() => {
if (!imageObj || !canvasRef.current) return;

drawCanvas(imageObj);
}, [imageObj, exif]);

const drawCanvas = (img: HTMLImageElement) => {
const drawCanvas = useCallback((img: HTMLImageElement) => {
const canvas = canvasRef.current;
if (!canvas) return;
// 好みの左右・上の枠の太さ（例：幅の3.5%）
const framePadding = Math.floor(img.width * 0.025);
// 好みの左右・上の枠の最小太さ（例：幅の2.5%）
const minFramePadding = Math.floor(img.width * 0.025);
// 下部のテキスト領域に必要な最小スペース
const minBottomSpace = Math.floor(minFramePadding * 4.5);

let targetRatio = 4300 / 3618;
if (aspectRatioPreset === "custom") {
if (customRatioW > 0 && customRatioH > 0) {
targetRatio = customRatioW / customRatioH;
} else {
targetRatio = img.width / img.height;
}
} else {
const [w, h] = aspectRatioPreset.split(':').map(Number);
if (w && h) targetRatio = w / h;
}

// Apply orientation flip
if (orientation === "portrait" && targetRatio > 1) {
targetRatio = 1 / targetRatio;
} else if (orientation === "landscape" && targetRatio < 1) {
targetRatio = 1 / targetRatio;
}

const minCanvasWidth = img.width + (minFramePadding * 2);
const minCanvasHeight = img.height + minFramePadding + minBottomSpace;

// 全体の仕上がりを 4300 : 3618 の比率に強制する
const targetRatio = 4300 / 3618;
// まず幅を基準に高さを計算
let finalCanvasWidth = minCanvasWidth;
let finalCanvasHeight = Math.floor(finalCanvasWidth / targetRatio);

if (finalCanvasHeight < minCanvasHeight) {
// 高さが足りない場合は、最小の高さを基準にして幅を拡張
finalCanvasHeight = minCanvasHeight;
finalCanvasWidth = Math.floor(finalCanvasHeight * targetRatio);
}
Comment on lines +155 to +185

// 完成品の幅を先に決め、ターゲット比率から高さを逆算する
// ⚠️ CRITICAL: Must be set BEFORE getContext, otherwise context properties (colorSpace) are reset!
canvas.width = img.width + (framePadding * 2);
canvas.height = Math.floor(canvas.width / targetRatio);
canvas.width = finalCanvasWidth;
canvas.height = finalCanvasHeight;

// 余分な高さを計算
const extraHeight = finalCanvasHeight - minCanvasHeight;

// 画像の配置位置を計算 (左右中央、上固定または上下中央)
const drawX = Math.floor((finalCanvasWidth - img.width) / 2);
const drawY = alignment === "center" ? minFramePadding + Math.floor(extraHeight / 2) : minFramePadding;

// Enable P3 wide-gamut mode to prevent high-saturation color loss, with a fallback
let ctx: CanvasRenderingContext2D | null = null;
Expand All @@ -167,21 +207,20 @@ function App() {
}
if (!ctx) return;

// 完成品の高さから「下の余白（margin）」を逆算
const margin = canvas.height - img.height - (framePadding * 2);

// Fill background
ctx.fillStyle = '#ffffff';
ctx.fillRect(0, 0, canvas.width, canvas.height);

// Draw image
ctx.drawImage(img, framePadding, framePadding);
ctx.drawImage(img, drawX, drawY);

// 写真の下端からキャンバスの下端までの「目に見える下の白枠すべて」の高さ
const bottomSpaceHeight = margin + framePadding;
// 画像の下端座標
const imgBottomY = drawY + img.height;
// 写真の下端からキャンバスの下端までの余白
const bottomSpaceHeight = canvas.height - imgBottomY;

// 本当の視覚的な中央座標を計算
const textY = img.height + framePadding + (bottomSpaceHeight / 2);
// テキストの配置Y座標は、画像の下端とキャンバス下端の中央
const textY = imgBottomY + (bottomSpaceHeight / 2);

// テキストのサイズを（marginではなく）画像自体のサイズを基準にする
const baseScale = Math.min(img.width, img.height);
Expand Down Expand Up @@ -214,12 +253,18 @@ function App() {

// Draw a subtle line separator (just above the text)
ctx.beginPath();
ctx.moveTo(canvas.width * 0.2, img.height + framePadding);
ctx.lineTo(canvas.width * 0.8, img.height + framePadding);
ctx.moveTo(canvas.width * 0.2, imgBottomY);
ctx.lineTo(canvas.width * 0.8, imgBottomY);
ctx.strokeStyle = '#e0e0e0';
ctx.lineWidth = Math.max(1, Math.floor(baseScale * 0.0015));
ctx.stroke();
};
}, [exif, aspectRatioPreset, customRatioW, customRatioH, orientation, alignment]);

useEffect(() => {
if (!imageObj || !canvasRef.current) return;

drawCanvas(imageObj);
}, [imageObj, drawCanvas]);

const downloadImage = async () => {
if (!canvasRef.current || !imageObj) return;
Expand Down Expand Up @@ -353,7 +398,89 @@ function App() {

{imageLoaded && (
<aside className="sidebar">
<div className="sidebar-section">
<div className="sidebar-section frame-settings-section">
<h3>Frame Settings</h3>
<div className="input-group">
<label htmlFor="aspect-ratio-preset">Aspect Ratio</label>
<select
id="aspect-ratio-preset"
value={aspectRatioPreset}
onChange={(e) => setAspectRatioPreset(e.target.value)}
>
<option value="4300:3618">Default (4300:3618)</option>
<option value="1:1">Square (1:1)</option>
<option value="3:2">3:2</option>
<option value="4:3">4:3</option>
<option value="16:9">16:9</option>
<option value="custom">Custom</option>
</select>
</div>
{aspectRatioPreset === "custom" && (
<div className="input-row">
<div className="input-group">
<label htmlFor="custom-ratio-w">Width</label>
<input
id="custom-ratio-w"
type="number"
value={customRatioW || ''}
onChange={e => setCustomRatioW(Number(e.target.value) || 0)}
min="1"
/>
</div>
<div className="input-group">
<label htmlFor="custom-ratio-h">Height</label>
<input
id="custom-ratio-h"
type="number"
value={customRatioH || ''}
onChange={e => setCustomRatioH(Number(e.target.value) || 0)}
min="1"
/>
</div>
</div>
)}
<div className="input-group">
<label>Orientation</label>
<div className={`segmented-control ${aspectRatioPreset === '1:1' ? 'disabled' : ''}`}>
<button
className={`segment ${orientation === 'landscape' ? 'active' : ''}`}
onClick={() => setOrientation('landscape')}
disabled={aspectRatioPreset === '1:1'}
>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><rect x="3" y="5" width="18" height="14" rx="2" ry="2"></rect></svg>
Landscape
</button>
<button
className={`segment ${orientation === 'portrait' ? 'active' : ''}`}
onClick={() => setOrientation('portrait')}
disabled={aspectRatioPreset === '1:1'}
>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><rect x="5" y="3" width="14" height="18" rx="2" ry="2"></rect></svg>
Portrait
</button>
</div>
</div>
<div className="input-group">
<label>Vertical Alignment</label>
<div className="segmented-control">
<button
className={`segment ${alignment === 'top' ? 'active' : ''}`}
onClick={() => setAlignment('top')}
>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><line x1="4" y1="4" x2="20" y2="4"></line><rect x="8" y="8" width="8" height="8" rx="1" ry="1"></rect></svg>
Top
</button>
<button
className={`segment ${alignment === 'center' ? 'active' : ''}`}
onClick={() => setAlignment('center')}
>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><line x1="4" y1="12" x2="20" y2="12"></line><rect x="8" y="8" width="8" height="8" rx="1" ry="1"></rect></svg>
Center
</button>
</div>
Comment on lines +443 to +480
</div>
</div>
<div className="sidebar-section metadata-settings-section">
<h3>Metadata Settings</h3>
<div className="input-group">
<label htmlFor="camera-input">Camera</label>
Expand Down