xiaoqidun/ofdgo
1
0 Fork 0
mirror of https://github.com/xiaoqidun/ofdgo.git synced 2026-10-29 16:44:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(编辑能力): 修复文字编辑光标越界
build.yaml / build (push) Successful in 48s
Details

Browse Source
This commit is contained in:
xiaoqidun committed 2026-10-26 21:19:26 +08:00
1 parent 41a50d9e96
commit 04efce42d8
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
assets/webui/ofdgo_edit.js
+4 -4
View File
@@ -1835,7 +1835,7 @@ export class CanvasEditor {
const rotation = run.rotation ?? source.rotation ?? 0, angle = rotation * Math.PI / 180; const rotation = run.rotation ?? source.rotation ?? 0, angle = rotation * Math.PI / 180;
const cos = Math.cos(angle), sin = Math.sin(angle); const cos = Math.cos(angle), sin = Math.sin(angle);
context.font = `${italic ? "italic" : "normal"} ${weight} ${runSize}px "${runFace.family}"`; context.font = `${italic ? "italic" : "normal"} ${weight} ${runSize}px "${runFace.family}"`;
const metrics = context.measureText("Mg"), baseline = (runSize + metrics.fontBoundingBoxAscent - metrics.fontBoundingBoxDescent) / 2; const metrics = context.measureText("Mg"), baseline = metrics.fontBoundingBoxAscent, lineHeight = baseline + metrics.fontBoundingBoxDescent;
if (!line || run.line) { if (!line || run.line) {
if (line) position++; if (line) position++;
line = document.createElement("div"); line = document.createElement("div");
@@ -1849,7 +1849,7 @@ export class CanvasEditor {
left = Math.min(left, x); left = Math.min(left, x);
top = Math.min(top, y - baseline); top = Math.min(top, y - baseline);
right = Math.max(right, x); right = Math.max(right, x);
bottom = Math.max(bottom, y + runSize - baseline); bottom = Math.max(bottom, y + lineHeight - baseline);
} }
for (const char of run.text) { for (const char of run.text) {
x = run.positions[index][0] * unit; x = run.positions[index][0] * unit;
@@ -1861,7 +1861,7 @@ export class CanvasEditor {
span.dataset.glyph = glyph; span.dataset.glyph = glyph;
glyphPositions.push({ span, start: position, end: position + char.length }); glyphPositions.push({ span, start: position, end: position + char.length });
} }
Object.assign(span.style, { display: "inline-block", verticalAlign: "top", fontFamily: `"${runFace.family}"`, fontSize: `${runSize}px`, lineHeight: `${runSize}px`, Object.assign(span.style, { display: "inline-block", verticalAlign: "top", fontFamily: `"${runFace.family}"`, fontSize: `${runSize}px`, lineHeight: `${lineHeight}px`,
fontWeight: String(weight), fontStyle: italic ? "italic" : "normal", color: editing.style?.color ?? run.color ?? item.color, fontWeight: String(weight), fontStyle: italic ? "italic" : "normal", color: editing.style?.color ?? run.color ?? item.color,
opacity: String((run.alpha ?? item.alpha ?? 255) / 255), transformOrigin: `left ${baseline}px`, opacity: String((run.alpha ?? item.alpha ?? 255) / 255), transformOrigin: `left ${baseline}px`,
transform: `translate(${x - naturalX}px,${y - baseline - lineIndex * size}px) rotate(${rotation}deg) scale(${scale},${vscale})` }); transform: `translate(${x - naturalX}px,${y - baseline - lineIndex * size}px) rotate(${rotation}deg) scale(${scale},${vscale})` });
@@ -1871,7 +1871,7 @@ export class CanvasEditor {
const advance = context.measureText(glyph || char).width; const advance = context.measureText(glyph || char).width;
if (glyph) span.style.width = `${advance}px`; if (glyph) span.style.width = `${advance}px`;
for (const dx of [0, advance * scale]) { for (const dx of [0, advance * scale]) {
for (const dy of [-baseline * vscale, (runSize - baseline) * vscale]) { for (const dy of [-baseline * vscale, (lineHeight - baseline) * vscale]) {
const px = x + dx * cos - dy * sin, py = y + dx * sin + dy * cos; const px = x + dx * cos - dy * sin, py = y + dx * sin + dy * cos;
left = Math.min(left, px); left = Math.min(left, px);
top = Math.min(top, py); top = Math.min(top, py);