Monorepo for Aesthetic.Computer
aesthetic.computer
prompt: resolve stray merge-conflict markers from d53a2a9fc
Keep the upstream MatrixChunky8-measured notepat button logic;
drop the stashed one-liner that only set notepatX. This was
breaking the /prompt piece in production with SyntaxError: '<<'.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
-4
-4
system/public/aesthetic.computer/disks/prompt.mjs
-4
system/public/aesthetic.computer/disks/prompt.mjs
···
5941
5941
// starts at box.x + 2 + 2*spaces. Icon frame (13×9) ends at box.x + 14,
5942
5942
// so 8 spaces (x+18) leaves a 3px gap after the frame.
5943
5943
const notepatLabel = " notepat";
5944
-
<<<<<<< Updated upstream
5945
5944
// TextButtonSmall sizes the box as label.length * 4, but MatrixChunky8
5946
5945
// is proportional (spaces advance only 2px), so the button overshoots.
5947
5946
// Measure the actual rendered width and tighten the box below.
···
5963
5962
const notepatPos = stackVertically
5964
5963
? { center: "x", y: buttonY - notepatHeight - stackedGap, screen }
5965
5964
: { x: cBox.x + cBox.w + pairGap, y: buttonY };
5966
-
=======
5967
-
const notepatX = cBox.x + cBox.w + 4;
5968
-
>>>>>>> Stashed changes
5969
5965
if (!notepatBtn) {
5970
5966
notepatBtn = new $.ui.TextButtonSmall(notepatLabel, notepatPos);
5971
5967
} else {