Skip to content

fix(window): repair two regressions from the audit remediation (#97) - #99

Merged
pignuante merged 3 commits into
mainfrom
fix/undo-and-anchor-regressions
Jul 21, 2026
Merged

fix(window): repair two regressions from the audit remediation (#97)#99
pignuante merged 3 commits into
mainfrom
fix/undo-and-anchor-regressions

Conversation

@pignuante

Copy link
Copy Markdown
Contributor

What

#97 ์‚ฌํ›„ ๋ฆฌ๋ทฐ์—์„œ ์ œ๊ฐ€ ๊ทธ PR๋กœ ๋Œ์–ด๋“ค์ธ ํšŒ๊ท€ 2๊ฑด์„ ์ฐพ์•„ ๊ณ ์นœ๋‹ค. ๋‘˜ ๋‹ค probe๋กœ ์žฌํ˜„ํ–ˆ๊ณ  ํšŒ๊ท€ ํ…Œ์ŠคํŠธ๋ฅผ ๋ถ™์˜€๋‹ค.

1. ์ž‘์€ ๋ณ€๊ฒฝ์—์„œ Undo๊ฐ€ ์†Œ์‹ค๋จ (3f7b290)

FrameApply.changed๋Š” "Undo๋ฅผ ๊ธฐ๋กํ• ์ง€"๋ฅผ ๋ฌป๋Š”๋ฐ, reached์šฉ ๊ด€๋Œ€ํ•œ ํ—ˆ์šฉ์˜ค์ฐจ(origin 2ptยทsize 8pt)๋ฅผ ์žฌ์‚ฌ์šฉํ•˜๊ณ  ์žˆ์—ˆ๋‹ค. ์ •์ž‘ ์“ฐ๊ธฐ ์—ฌ๋ถ€๋Š” changeEpsilon(0.5pt) ์œผ๋กœ ์ •ํ•˜๋ฏ€๋กœ 0.5~8pt ๊ตฌ๊ฐ„์—์„œ ๋‘ ํŒ์ •์ด ์–ด๊ธ‹๋‚ฌ๋‹ค โ€” ์ฐฝ์€ ์‹ค์ œ๋กœ ๋ฐ”๋€Œ๋Š”๋ฐ undo๋Š” ๊ธฐ๋ก๋˜์ง€ ์•Š์•˜๋‹ค.

๋” ๋‚˜์œ ๊ฑด ๋‹จ์ˆœํžˆ "๋˜๋Œ๋ฆด ๊ฒƒ ์—†์Œ"์ด ์•„๋‹ˆ๋ผ๋Š” ์ ์ด๋‹ค: ๊ธฐ๋ก์„ ๊ฑด๋„ˆ๋›ฐ๋ฉด ์ง์ „ ๋ช…๋ น์˜ undo ํ•ญ๋ชฉ์ด ์‚ด์•„๋‚จ์•„, ์ž‘์€ ์กฐ์ • ํ›„ Undo๋ฅผ ๋ˆ„๋ฅด๋ฉด ์ฐฝ์ด ํ•œ์ฐธ ์ „ frame์œผ๋กœ ํŠ„๋‹ค.

์žฌํ˜„ ์Šค์œ• (์ˆ˜์ • ์ „ โ†’ ํ›„):

๋ถˆ์ผ์น˜(์“ฐ๊ธฐ O / ๋ณ€ํ™” X): 384๊ฑด โ†’ 0๊ฑด
  rel2/3(.left) 96 ยท relHalf(.left) 96 ยท abs(h,*,first) 48ร—3 ยท move(.right) 24 ยท relHalf(.right) 24
  ์˜ˆ: relHalf(.left) cur=(0,101x120) -> target=(0,100x120)   โ† 1pt ์ถ•์†Œ, ์“ฐ๊ธฐ O / undo X

โ†’ changed๊ฐ€ ์“ฐ๊ธฐ์™€ ๊ฐ™์€ changeEpsilon์„ ์“ฐ๋„๋ก ํ•ด "์“ธ ๋งŒํผ ๋‹ฌ๋ผ์กŒ์œผ๋ฉด ๋ณ€ํ•œ ๊ฒƒ" ๋ถˆ๋ณ€์‹์„ ๋ณต์›. reached๋Š” "์•ฑ์ด ๋ชฉํ‘œ์— ๋„๋‹ฌํ–ˆ๋‚˜"๋ผ๋Š” ๋‹ค๋ฅธ ์งˆ๋ฌธ์ด๋ฏ€๋กœ ๊ด€๋Œ€ํ•œ ๊ฐ’ ์œ ์ง€.

2. ์•ต์ปค origin ํด๋žจํ”„ ๋ˆ„๋ฝ + ๋น„์ •์ƒ ํฌ๊ธฐ ์ „ํŒŒ (2a374ef)

anchoredOrigin์˜ .right/.bottom์— ์ž‘์—…์˜์—ญ ํด๋žจํ”„๊ฐ€ ์—†์—ˆ๋‹ค. M-4 ์ด์ „์—” ์ƒ๋Œ€ ์ถ•์†Œ๋„ workAreaEdges(ํด๋žจํ”„ ์žˆ์Œ) ๊ฒฝ๋กœ๋ฅผ ํƒ”์œผ๋ฏ€๋กœ, ๋ช…์‹œ์  anchor๋ฅผ ๋„์ž…ํ•˜๋ฉฐ ๋ณดํ˜ธ๋ฅผ ์žƒ์€ ํšŒ๊ท€๋‹ค.

current=(50,200,300,600)  target=(200,200,150,600)  ์•ฑ ์ตœ์†Œํญ 800
.right origin:  (-450, 200)  โš ๏ธ ํ™”๋ฉด ๋ฐ–  โ†’  (0, 200)  ํด๋žจํ”„๋จ
NaN ์‹ค์ œํญ   :  (nan, 200)   โš ๏ธ AX๋กœ ์ „ํŒŒ โ†’  (200, 200)  ๋ชฉํ‘œ origin ํด๋ฐฑ

์ตœ์†Œํญ์ด ํฐ ์ œ์•ฝ ์•ฑ์„ ํ™”๋ฉด ์™ผ์ชฝ ๊ทผ์ฒ˜์—์„œ ์šฐ์ธก ์•ต์ปค๋กœ ์ถ•์†Œํ•˜๋ฉด ์ฐฝ์ด ํ™”๋ฉด ๋ฐ–์œผ๋กœ ๋ฐ€๋ ธ๋‹ค. ํ•จ๊ป˜, actualSize ์œ ํ•œ์„ฑ์„ ๊ฒ€์‚ฌํ•˜์ง€ ์•Š์•„ ์•ฑ์ด NaN ํฌ๊ธฐ๋ฅผ ๋ณด๊ณ ํ•˜๋ฉด NaN origin์ด ๊ทธ๋Œ€๋กœ AX ์“ฐ๊ธฐ๋กœ ํ˜๋Ÿฌ๊ฐ”๋‹ค(๋ณด์•ˆ ๋ฆฌ๋ทฐ๊ฐ€ defense-in-depth๋กœ ์ง€์ ํ•œ ์ง€์ ).

๊ฒ€์ฆ

  • make test 186 โ†’ 192 checks (ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 6๊ฑด ์ถ”๊ฐ€) ยท make lint 0 ยท make coverage ๋ผ์ธ 100% ยท make build โœ…
  • ์Šค์œ• probe๋กœ 1๋ฒˆ์€ 384โ†’0, 2๋ฒˆ์€ ํด๋žจํ”„ยทNaN ํด๋ฐฑ ์ง์ ‘ ํ™•์ธ

๋ฆฌ๋ทฐ

๋ณด์•ˆ ๋ฆฌ๋ทฐ ์™„๋ฃŒ โ€” ๊ถŒํ•œ ๊ฒŒ์ดํŠธ ์•ฝํ™” ์—†์Œ(์ด์Šˆ ์—†์Œ). ์ •ํ•ฉ์„ฑยท์•Œ๊ณ ๋ฆฌ์ฆ˜ ๋ฆฌ๋ทฐ๋Š” ์ง„ํ–‰ ์ค‘์ด๋ฉฐ, ์ถ”๊ฐ€ ๋ฐœ๊ฒฌ์ด ์žˆ์œผ๋ฉด ์ด PR์— ์ปค๋ฐ‹์„ ๋ง๋ถ™์ธ๋‹ค.

FrameApply.changed๋Š” 'Undo๋ฅผ ๊ธฐ๋กํ• ์ง€'๋ฅผ ๋ฌป๋Š”๋ฐ reached์šฉ ๊ด€๋Œ€ํ•œ ํ—ˆ์šฉ์˜ค์ฐจ(origin 2ptยท
size 8pt)๋ฅผ ์“ฐ๊ณ  ์žˆ์—ˆ๋‹ค. ์“ฐ๊ธฐ ์—ฌ๋ถ€๋Š” changeEpsilon(0.5pt)์œผ๋กœ ์ •ํ•˜๋ฏ€๋กœ 0.5~8pt ๊ตฌ๊ฐ„์—์„œ
๋‘ ํŒ์ •์ด ์–ด๊ธ‹๋‚˜, ์ฐฝ์€ ์‹ค์ œ๋กœ ๋ฐ”๋€Œ์—ˆ๋Š”๋ฐ undo๊ฐ€ ๊ธฐ๋ก๋˜์ง€ ์•Š์•˜๋‹ค. ๊ทธ๋Ÿฌ๋ฉด ์ง์ „ ๋ช…๋ น์˜ undo
ํ•ญ๋ชฉ์ด ์‚ด์•„๋‚จ์•„ Undo ์‹œ ์ฐฝ์ด ํ•œ์ฐธ ์ „ frame์œผ๋กœ ํŠ„๋‹ค.

changed๊ฐ€ ์“ฐ๊ธฐ์™€ ๋™์ผํ•œ changeEpsilon์„ ์“ฐ๋„๋ก ํ•ด '์“ธ ๋งŒํผ ๋‹ฌ๋ผ์กŒ์œผ๋ฉด ๋ณ€ํ•œ ๊ฒƒ' ๋ถˆ๋ณ€์‹์„
๋ณต์›ํ•œ๋‹ค. reached๋Š” '์•ฑ์ด ๋ชฉํ‘œ์— ๋„๋‹ฌํ–ˆ๋‚˜'๋ผ๋Š” ๋‹ค๋ฅธ ์งˆ๋ฌธ์ด๋ฏ€๋กœ ๊ด€๋Œ€ํ•œ ๊ฐ’์„ ์œ ์ง€ํ•œ๋‹ค.

์˜ํ–ฅ ๋ฒ”์œ„(์ˆ˜์ • ์ „ ์Šค์œ•): 7๊ฐœ ๋ช…๋ น 384์กฐํ•ฉ โ€” ์ƒ๋Œ€ ์ถ•์†Œ 100pt ํ•˜ํ•œ ๊ตฌ๊ฐ„, ์ ˆ๋Œ€ ๋ฐฐ์น˜,
์ด๋™ ํด๋žจํ”„ ๊ตฌ๊ฐ„. ์ˆ˜์ • ํ›„ ๋™์ผ ์Šค์œ•์—์„œ ๋ถˆ์ผ์น˜ 0.
b7692e5(#97)์—์„œ ๋“ค์–ด์˜จ ํšŒ๊ท€.
anchoredOrigin์˜ .right/.bottom ๊ฒฝ๋กœ์— ์ž‘์—…์˜์—ญ ํด๋žจํ”„๊ฐ€ ์—†์—ˆ๋‹ค. M-4 ์ด์ „์—๋Š” ์ƒ๋Œ€ ์ถ•์†Œ๋„
workAreaEdges(ํด๋žจํ”„ ์žˆ์Œ) ๊ฒฝ๋กœ๋ฅผ ํƒ”์œผ๋ฏ€๋กœ, ๋ช…์‹œ์  anchor๋ฅผ ๋„์ž…ํ•˜๋ฉฐ ๋ณดํ˜ธ๋ฅผ ์žƒ์€ ํšŒ๊ท€๋‹ค.
์ตœ์†Œํญ์ด ํฐ ์ œ์•ฝ ์•ฑ์„ ํ™”๋ฉด ์™ผ์ชฝ ๊ทผ์ฒ˜์—์„œ ์šฐ์ธก ์•ต์ปค๋กœ ์ถ•์†Œํ•˜๋ฉด ๊ณ ์ • ๋ชจ์„œ๋ฆฌ๋ฅผ ์ง€ํ‚ค๋ ค๋‹ค ์ฐฝ์ด
์ž‘์—…์˜์—ญ ๋ฐ–์œผ๋กœ ๋ฐ€๋ ธ๋‹ค(์˜ˆ: target.maxX=350, ์•ฑ ์‹ค์ œํญ 800 โ†’ x=-450).

๋˜ actualSize์˜ ์œ ํ•œ์„ฑ์„ ๊ฒ€์‚ฌํ•˜์ง€ ์•Š์•„, ์•ฑ์ด NaN/๋ฌดํ•œ ํฌ๊ธฐ๋ฅผ ๋ณด๊ณ ํ•˜๋ฉด NaN origin์ด ๊ทธ๋Œ€๋กœ
AX ์“ฐ๊ธฐ๋กœ ํ˜๋Ÿฌ๊ฐ”๋‹ค. ๋น„์ •์ƒ ํฌ๊ธฐ๋ฉด ์•ต์ปค ๋ณด์ •์„ ํฌ๊ธฐํ•˜๊ณ  ๋ชฉํ‘œ origin์„ ์“ด๋‹ค.

๋‘˜ ๋‹ค b7692e5(#97)์—์„œ ๋“ค์–ด์˜จ ํšŒ๊ท€. ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 3๊ฑด ์ถ”๊ฐ€(ํด๋žจํ”„ ์ขŒ/ํ•˜, NaN ํด๋ฐฑ).
โ€ฆependent

๋ฆฌ๋ทฐ์—์„œ ์ถ”๊ฐ€๋กœ ๋“œ๋Ÿฌ๋‚œ 3๊ฑด. ์•ž์„  ๋‘ ํšŒ๊ท€์™€ ๊ฐ™์€ ๊ณ„์—ด(ํ—ˆ์šฉ์˜ค์ฐจยท๋น„๊ต์ž ์„ค๊ณ„)์ด๋‹ค.

1) Writer์˜ readFrame์ด ๋น„์ •์ƒ frame์„ ๊ฑฐ๋ฅด์ง€ ์•Š์•„, NaN achieved๊ฐ€ Executor๋กœ ํ˜๋Ÿฌ๊ฐ€
   FrameApply.changed์—์„œ 'true'(NaN ๋น„๊ต๋Š” ์ „๋ถ€ false โ†’ ๋‹ค๋ฆ„์œผ๋กœ ํŒ์ •)๊ฐ€ ๋˜๊ณ  **ํ—ˆ์œ„ undo
   ํ•ญ๋ชฉ**์ด ๋ฉ€์ฉกํ•œ ์ง์ „ ํ•ญ๋ชฉ์„ ๋ฎ์—ˆ๋‹ค. readFrame์—์„œ isUsableFrame์œผ๋กœ ์ฐจ๋‹จํ•œ๋‹ค.

2) NSScreen.bestMatch์˜ ์ˆœ์ฐจ ๋น„๊ต์ž๊ฐ€ ๋น„์ถ”์ด์ ์ด์—ˆ๋‹ค. ๋™๋ฅ ๋กœ ์ด๊ธด ํ™”๋ฉด์˜ ๋” ์ž‘์€ ๋ฉด์ ์ด
   ๊ธฐ์ค€(bestArea)์„ ๋‚ฎ์ถฐ ์ดํ›„ ํ›„๋ณด์˜ ๋ฌธํ„ฑ์ด ๋‚ด๋ ค๊ฐ€๊ณ , ์—ด๊ฑฐ ์ˆœ์„œ์— ๋”ฐ๋ผ ์ตœ๋Œ€ ๋ฉด์ ์ด ์•„๋‹Œ
   ํ™”๋ฉด์ด ๋ฝ‘ํž ์ˆ˜ ์žˆ์—ˆ๋‹ค(L-1์ด ์—†์• ๋ ค๋˜ ์ˆœ์„œ ์˜์กด์„ฑ). ์ตœ๋Œ€ ๋ฉด์ ์„ ๋จผ์ € ํ™•์ •ํ•œ ๋’ค ๊ทธ ๋™๋ฅ 
   ์ง‘ํ•ฉ์—์„œ๋งŒ ์ฐฝ ์ค‘์‹ฌ ํฌํ•จ โ†’ ์ž‘์€ displayID๋กœ ๊ณ ๋ฅด๋Š” 2-ํŒจ์Šค๋กœ ๋ฐ”๊พผ๋‹ค.

3) ๊ฐ™์€ ํŒจํ„ด์ด selectAdjacentIndex์—๋„ ์žˆ์—ˆ๋‹ค. perpendicular ๋น„๊ต์— ๋ฐ๋“œ๋ฐด๋“œ๋ฅผ ์“ฐ๋ฉด
   [1.2,0.8,0.4,0.0]์—์„œ ์ตœ์†Œ๊ฐ€ ์•„๋‹Œ 0.4๊ฐ€ ๋ฝ‘ํžˆ๊ณ  ์ˆœ์„œ๋ฅผ ๋’ค์ง‘์œผ๋ฉด ๊ฒฐ๊ณผ๊ฐ€ ๋‹ฌ๋ผ์กŒ๋‹ค. ๋น„๊ต์—์„œ
   ๋ฐ๋“œ๋ฐด๋“œ๋ฅผ ๋นผ ์ฐธ ์ตœ์†Ÿ๊ฐ’์„ ๊ณ ๋ฅด๊ฒŒ ํ•œ๋‹ค(์ •ํ™• ๋™๋ฅ ๋งŒ ๋จผ์ € ๋‚˜์˜จ ์ธ๋ฑ์Šค).
   ์‚ญ์ œ๋œ tiebreak๋ฅผ ์—ฌ์ „ํžˆ ์•ฝ์†ํ•˜๋˜ ํ—ค๋” ์ฃผ์„๋„ ์ •์ •.

ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 2๊ฑด ์ถ”๊ฐ€(์‚ฌ๋‹ค๋ฆฌ ์ •ยท์—ญ์ˆœ). 194 checks.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant