Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix: getScale is not correct after ctx.rotate (#3792)

lumixb0c5f133e075
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png
index 82f15024c0..41875f2f7d 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png differ
diff --git a/packages/engine-render/src/components/docs/extensions/line.ts b/packages/engine-render/src/components/docs/extensions/line.ts
index ff89ed2a75..71641ffa25 100644
--- a/packages/engine-render/src/components/docs/extensions/line.ts
+++ b/packages/engine-render/src/components/docs/extensions/line.ts
@@ -19,7 +19,7 @@ import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton
import type { UniverRenderingContext } from '../../../context';
import { BaselineOffset, BooleanNumber, getColorStyle, TextDecoration } from '@univerjs/core';
-import { COLOR_BLACK_RGB, DEFAULT_OFFSET_SPACING, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';
+import { COLOR_BLACK_RGB, DEFAULT_OFFSET_SPACING } from '../../../basics/const';
import { calculateRectRotate } from '../../../basics/draw';
import { degToRad, getScale } from '../../../basics/tools';
import { Vector2 } from '../../../basics/vector2';
@@ -39,12 +39,6 @@ export class Line extends docExtension {
override draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph) {
const line = glyph.parent?.parent;
- const { renderConfig } = this.extensionOffset;
- // rotation of cell text
- // rotate up down 90 cause problem, univer-pro/issues/2802, This is only a temporary solution
- const vertexAngle = renderConfig?.vertexAngle || 0;
- const centerAngle = renderConfig?.centerAngle || 0;
- const drawStrikeAndUnderline = !(centerAngle === 0 && vertexAngle !== 0 && vertexAngle % 90 === 0);
const { ts: textStyle, bBox, content } = glyph;
if (line == null || textStyle == null || content === '\r') {
@@ -57,7 +51,7 @@ export class Line extends docExtension {
const DELTA = 0.5;
const { ul: underline, st: strikethrough, ol: overline, va: baselineOffset, bbl: bottomBorderLine } = textStyle;
- if (drawStrikeAndUnderline && underline) {
+ if (underline) {
const startY = asc + dsc;
this._drawLine(ctx, glyph, underline, startY, scale);
}
@@ -67,7 +61,7 @@ export class Line extends docExtension {
this._drawLine(ctx, glyph, bottomBorderLine, startY, scale, 2);
}
- if (drawStrikeAndUnderline && strikethrough) {
+ if (strikethrough) {
// strikethrough position is the middle of bounding box ascent and descent.
let startY = asc + bd - strikeoutPosition - DELTA;
@@ -126,12 +120,10 @@ export class Line extends docExtension {
const { centerAngle: centerAngleDeg = 0, vertexAngle: vertexAngleDeg = 0 } = renderConfig;
- const centerAngle = degToRad(centerAngleDeg);
- const vertexAngle = degToRad(vertexAngleDeg);
-
ctx.save();
- ctx.translateWithPrecisionRatio(FIX_ONE_PIXEL_BLUR_OFFSET, FIX_ONE_PIXEL_BLUR_OFFSET);
+ // translate with precision is handled in moveToByPrecision and lineToByPrecision. NO NEED to do this again!
+ // ctx.translateWithPrecision(FIX_ONE_PIXEL_BLUR_OFFSET, FIX_ONE_PIXEL_BLUR_OFFSET);
const color =
(c === BooleanNumber.TRUE ? getColorStyle(glyph.ts?.cl) : getColorStyle(colorStyle)) || COLOR_BLACK_RGB;
@@ -140,6 +132,8 @@ export class Line extends docExtension {
this._setLineType(ctx, lineType || TextDecoration.SINGLE);
+ const centerAngle = degToRad(centerAngleDeg);
+ const vertexAngle = degToRad(vertexAngleDeg);
const start = calculateRectRotate(
originTranslate.addByPoint(left, startY),
Vector2.create(0, 0),
@@ -159,7 +153,6 @@ export class Line extends docExtension {
ctx.moveToByPrecision(start.x, start.y);
ctx.lineToByPrecision(end.x, end.y);
ctx.stroke();
-
ctx.restore();
}
diff --git a/packages/engine-render/src/context.ts b/packages/engine-render/src/context.ts
index eef2d6d874..31d4613bb8 100644
--- a/packages/engine-render/src/context.ts
+++ b/packages/engine-render/src/context.ts
@@ -30,8 +30,8 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
private _browserType: string;
constructor(context: CanvasRenderingContext2D) {
- this._context = context;
this.canvas = context.canvas;
+ this._context = context;
}
isContextLost(): boolean {
@@ -289,12 +289,21 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
this._context.textBaseline = val;
}
- private _getScale() {
- const m = this._transformCache || this.getTransform();
- if (!this._transformCache && m) this._transformCache = m;
+ /**
+ * Get scale from ctx.
+ * DOMMatrix.a DOMMatrix.d would affect by ctx.rotate()
+ */
+ protected _getScale() {
+ const transform = this.getTransform();
+ const { a, b, c, d } = transform;
+
+ const scaleX = Math.sqrt(a * a + b * b);
+ const scaleY = Math.sqrt(c * c + d * d);
+ // const angle = Math.atan2(b, a);
+
return {
- scaleX: m.a,
- scaleY: m.d,
+ scaleX,
+ scaleY,
};
}
@@ -345,7 +354,8 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
}
getTransform() {
- return this._context.getTransform();
+ const m = this._transformCache || this._context.getTransform();
+ return m;
}
resetTransform() {
@@ -787,10 +797,16 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
const { scaleX, scaleY } = this._getScale();
x = fixLineWidthByScale(x, scaleX);
y = fixLineWidthByScale(y, scaleY);
-
this.moveTo(x, y);
}
+ moveToByPrecisionLog(x: number, y: number) {
+ const { scaleX, scaleY } = this._getScale();
+ const afterX = fixLineWidthByScale(x, scaleX);
+ const afterY = fixLineWidthByScale(y, scaleY);
+ this.moveTo(afterX, afterY);
+ }
+
/**
* rect function.
* @method
@@ -842,6 +858,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
* @method
*/
rotate(angle: number) {
+ this._transformCache = null;
this._context.rotate(angle);
}
@@ -858,6 +875,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
* @method
*/
scale(x: number, y: number) {
+ this._transformCache = null;
this._context.scale(x, y);
}
@@ -944,8 +962,8 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
* @method
*/
transform(a: number, b: number, c: number, d: number, e: number, f: number) {
- this._context.transform(a, b, c, d, e, f);
this._transformCache = null;
+ this._context.transform(a, b, c, d, e, f);
}
/**
@@ -953,10 +971,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
* @method
*/
translate(x: number, y: number) {
- // const { scaleX, scaleY } = this._getScale();
- // x = fixLineWidthByScale(x, scaleX);
- // y = fixLineWidthByScale(y, scaleY);
-
+ this._transformCache = null;
this._context.translate(x, y);
}
@@ -964,11 +979,12 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {
const { scaleX, scaleY } = this._getScale();
x = fixLineWidthByScale(x, scaleX);
y = fixLineWidthByScale(y, scaleY);
-
+ this._transformCache = null;
this._context.translate(x, y);
}
translateWithPrecisionRatio(x: number, y: number) {
+ this._transformCache = null;
const { scaleX, scaleY } = this._getScale();
this._context.translate(x / scaleX, y / scaleY);
}
@@ -998,16 +1014,8 @@ export class UniverRenderingContext extends UniverRenderingContext2D {
export class UniverPrintingContext extends UniverRenderingContext2D {
override __mode = 'printing';
- private __getScale() {
- const m = this.getTransform();
- return {
- scaleX: m.a,
- scaleY: m.d,
- };
- }
-
override clearRect(x: number, y: number, width: number, height: number): void {
- const { scaleX, scaleY } = this.__getScale();
+ const { scaleX, scaleY } = this._getScale();
x = fixLineWidthByScale(x, scaleX);
y = fixLineWidthByScale(y, scaleY);
width = fixLineWidthByScale(width, scaleX);