auto: 2026-08-29 16:28 (EOMSANGDON-HOME)

B07_DesignDetail/openwebcad/src/drawControllers/screenCanvas.drawController.ts

@@ -1,11 +1,12 @@
 import { Point, type Vector } from '@flatten-js/core';
-import { CANVAS_BACKGROUND_COLOR, MOUSE_ZOOM_MULTIPLIER } from '../App.consts';
+import { MOUSE_ZOOM_MULTIPLIER } from '../App.consts';
 import { getAngleWithXAxis } from '../helpers/get-angle-with-x-axis.ts';
 import { getBoundingBoxOfMultipleEntities } from '../helpers/get-bounding-box-of-multiple-entities.ts';
 import { mapNumberRange } from '../helpers/map-number-range.ts';
 import { StateVariable } from '../helpers/undo-stack.ts';
 import { getEntities, getGridEnabled, triggerReactUpdate } from '../state.ts';
 import { DEFAULT_TEXT_OPTIONS, type DrawController } from './DrawController';
+import { paintColor, themeColor } from '../theme.ts';
 
 /**
  * Screen coordinate system:
@@ -231,10 +232,12 @@ export class ScreenCanvasDrawController implements DrawController {
 	public setLineStyles(
 		isHighlighted: boolean,
 		isSelected: boolean,
-		color: string,
+		rawColor: string,
 		lineWidth: number,
 		dash: number[] = []
 	) {
+		// 저장된 도면 색은 다크 기준 — 라이트 테마에서는 그릴 때만 대비를 맞춘다.
+		const color = paintColor(rawColor);
 		if (this.batching) {
 			const effectiveWidth = isHighlighted ? lineWidth + 1 : lineWidth;
 			const effectiveDash = isSelected ? [5, 5] : dash;
@@ -298,7 +301,7 @@ export class ScreenCanvasDrawController implements DrawController {
 	}
 
 	public setFillStyles(fillColor: string) {
-		this.context.fillStyle = fillColor;
+		this.context.fillStyle = paintColor(fillColor);
 	}
 
 	/**
@@ -330,10 +333,10 @@ export class ScreenCanvasDrawController implements DrawController {
 		if (!this.context) return;
 		if (this.batching) this.flushBatch();
 
-		this.context.fillStyle = CANVAS_BACKGROUND_COLOR;
+		this.context.fillStyle = themeColor('--cad-canvas', '#111');
 		this.context.fillRect(0, 0, this.canvasSize?.x, this.canvasSize?.y);
 		if (getGridEnabled()) {
-			this.context.strokeStyle = '#242b35';
+			this.context.strokeStyle = themeColor('--color-mist', '#242b35');
 			this.context.lineWidth = 1;
 			this.context.setLineDash([]);
 			this.context.beginPath();
@@ -554,7 +557,7 @@ export class ScreenCanvasDrawController implements DrawController {
 		this.context.rotate(angle);
 		this.context.font = `${opts.fontSize}px ${opts.fontFamily}`;
 		this.context.textAlign = opts.textAlign;
-		this.context.fillStyle = opts.textColor;
+		this.context.fillStyle = paintColor(opts.textColor);
 		this.context.textBaseline = 'middle';
 		this.context.fillText(label, 0, 0);
 		this.context.restore();
@@ -630,7 +633,7 @@ export class ScreenCanvasDrawController implements DrawController {
 	public fillRectScreen(xMin: number, yMin: number, width: number, height: number, color: string) {
 		if (this.batching) this.flushBatch();
 		// TODO see if we need to replace this with a call to fillPolygon
-		this.context.fillStyle = color;
+		this.context.fillStyle = paintColor(color);
 		this.context.fillRect(xMin, this.canvasSize.y - yMin, width, height);
 	}