Skip to content

Commit 38870b0

Browse files
committed
🚩 移出了标签在缩小情况下显示巨大化的特性
1 parent 3263c6f commit 38870b0

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

app/src/core/render/canvas2d/renderer.tsx

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { Canvas } from "../../stage/Canvas";
1515
import { Stage } from "../../stage/Stage";
1616
import { StageHistoryManager } from "../../stage/stageManager/StageHistoryManager";
1717
import { StageManager } from "../../stage/stageManager/StageManager";
18-
import { TextNode } from "../../stage/stageObject/entity/TextNode";
1918
import { CurveRenderer } from "./basicRenderer/curveRenderer";
2019
import { ShapeRenderer } from "./basicRenderer/shapeRenderer";
2120
import { TextRenderer } from "./basicRenderer/textRenderer";
@@ -416,7 +415,7 @@ export namespace Renderer {
416415
/** 画所有被标签了的节点的特殊装饰物和缩小视野时的直观显示 */
417416
function renderTags() {
418417
for (const tagString of StageManager.TagOptions.getTagUUIDs()) {
419-
const tagObject = StageManager.getEntitiesByUUIDs([tagString])[0];
418+
const tagObject = StageManager.getStageObjectByUUID(tagString);
420419
if (!tagObject) {
421420
continue;
422421
}
@@ -431,25 +430,27 @@ export namespace Renderer {
431430
StageStyleManager.currentStyle.StageObjectBorderColor,
432431
2 * Camera.currentScale,
433432
);
434-
if (Camera.currentScale < 0.25 && tagObject instanceof TextNode) {
435-
const backRect = rect.clone();
436-
backRect.location = transformWorld2View(rect.center).add(new Vector(-rect.size.x / 2, -rect.size.y / 2));
437-
const rectBgc = StageStyleManager.currentStyle.BackgroundColor.clone();
438-
rectBgc.a = 0.5;
439-
ShapeRenderer.renderRect(
440-
backRect,
441-
rectBgc,
442-
StageStyleManager.currentStyle.StageObjectBorderColor,
443-
1,
444-
NODE_ROUNDED_RADIUS,
445-
);
446-
TextRenderer.renderTextFromCenter(
447-
tagObject.text,
448-
transformWorld2View(rect.center),
449-
FONT_SIZE,
450-
StageStyleManager.currentStyle.StageObjectBorderColor,
451-
);
452-
}
433+
// 用户不建议放大标签,所以这里注释掉了
434+
435+
// if (Camera.currentScale < 0.25 && tagObject instanceof TextNode) {
436+
// const backRect = rect.clone();
437+
// backRect.location = transformWorld2View(rect.center).add(new Vector(-rect.size.x / 2, -rect.size.y / 2));
438+
// const rectBgc = StageStyleManager.currentStyle.BackgroundColor.clone();
439+
// rectBgc.a = 0.5;
440+
// ShapeRenderer.renderRect(
441+
// backRect,
442+
// rectBgc,
443+
// StageStyleManager.currentStyle.StageObjectBorderColor,
444+
// 1,
445+
// NODE_ROUNDED_RADIUS,
446+
// );
447+
// TextRenderer.renderTextFromCenter(
448+
// tagObject.text,
449+
// transformWorld2View(rect.center),
450+
// FONT_SIZE,
451+
// StageStyleManager.currentStyle.StageObjectBorderColor,
452+
// );
453+
// }
453454
}
454455
}
455456
/**

app/src/core/stage/stageManager/StageManager.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export namespace StageManager {
184184
export function updateTags() {
185185
const uuids = tags.valuesToArray();
186186
for (const uuid of uuids) {
187-
if (!entities.hasId(uuid)) {
187+
if (!entities.hasId(uuid) && !associations.hasId(uuid)) {
188188
tags.deleteValue(uuid);
189189
}
190190
}

0 commit comments

Comments
 (0)