Add text annotations with toolbar editing and font fallback by yvette-carlisle · Pull Request #69 · hack-ink/rsnap

yvette-carlisle · 2026-04-08T12:10:44Z

Summary

add a text annotation tool with shared undo/redo history, draggable placement, blinking caret, and a secondary toolbar for size and color controls
support IME editing and candidate positioning in the overlay, and render text annotations into exports
load shared system font fallbacks for preview and export so CJK and mixed-script text render consistently without manual font mapping

Testing

cargo make lint
cargo make test

…lbar editing and font fallback","authority":"manual","breaking":false}

…fallback","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T12:22:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2da1a33cbf

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…rt anchor clipping","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T13:24:11Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 990f864421

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ehavior","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T13:38:08Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ba0a2b4b74

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ng exported text","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T13:57:29Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 480d319682

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…rottle caret repaint","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T14:31:37Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c1faf7e4b9

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…utput image","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T14:50:10Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 057044de5f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ing order","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T15:18:37Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 38073122f2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…tion aligned","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-08T16:13:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

rsnap/packages/rsnap-overlay/src/overlay/rendering/affordances.rs

Lines 2764 to 2767 in d0bc998

    
           if is_mode_tool { 
        
           	toolbar_state.selected_tool = tool; 
        
           } else { 
        
           	toolbar_state.pending_action = Some(tool);

Queue mode-tool clicks through the action path

This branch switches mode tools by writing toolbar_state.selected_tool directly, but it does not queue a pending_action. The text-edit teardown logic was added in handle_toolbar_action (and toolbar-window sync), so on the overlay-rendered toolbar path this can leave frozen_text_edit active after leaving Text mode until another unrelated input event occurs, which keeps stale caret/IME state and can commit text at an unexpected time.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…apture bounds","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-09T06:15:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6c74bfd903

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ew to capture bounds","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T07:00:25Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c8584f35d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…e budget is exhausted","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T07:44:59Z

@codex review

…dth from live tool layouts","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T07:52:13Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ea278d3884

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ompile across platforms","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T08:23:51Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2a3fafab26

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ive scroll capture","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T08:38:47Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9b17d8d037

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…er failed coverage loads","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T09:01:36Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2c6cbb795d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…d reuse brush export scratch","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T09:13:22Z

@codex review

…r behind target cfg","authority":"manual","breaking":false}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7c75a2e748

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…artup sizing","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T09:24:18Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 99ca1938f0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ll capture","authority":"manual","breaking":false}

yvette-carlisle · 2026-04-10T12:18:44Z

@codex review

chatgpt-codex-connector · 2026-04-10T12:29:17Z

Codex Review: Didn't find any major issues. What shall we delve into next?

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

{"schema":"maestro/commit/1","summary":"add text annotations with too…

39aeceb

…lbar editing and font fallback","authority":"manual","breaking":false}

aurexav marked this pull request as ready for review April 8, 2026 12:13

{"schema":"maestro/commit/1","summary":"fix ci style for system font …

2da1a33

…fallback","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/text_rendering.rs Outdated

Comment thread packages/rsnap-overlay/src/overlay/rendering/affordances.rs Outdated

{"schema":"maestro/commit/1","summary":"fix text hit testing and expo…

990f864

…rt anchor clipping","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/text_rendering.rs Outdated

Comment thread packages/rsnap-overlay/src/text_rendering.rs

{"schema":"maestro/commit/1","summary":"harden export text fallback b…

ba0a2b4

…ehavior","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/text_rendering.rs Outdated

{"schema":"maestro/commit/1","summary":"preserve alpha when compositi…

480d319

…ng exported text","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs Outdated

Comment thread packages/rsnap-overlay/src/overlay/aux_window_runtime.rs Outdated

{"schema":"maestro/commit/1","summary":"defer ime finalization and th…

c1faf7e

…rottle caret repaint","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs Outdated

{"schema":"maestro/commit/1","summary":"scale frozen exports to the o…

057044d

…utput image","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay/rendering/affordances.rs Outdated

{"schema":"maestro/commit/1","summary":"preserve frozen overlay stack…

3807312

…ing order","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs Outdated

{"schema":"maestro/commit/1","summary":"keep frozen edit payload evic…

d0bc998

…tion aligned","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay/rendering/affordances.rs

{"schema":"maestro/commit/1","summary":"clip frozen text preview to c…

6c74bfd

…apture bounds","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 9, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay/rendering/affordances.rs Outdated

{"schema":"maestro/commit/1","summary":"clip active frozen text previ…

113cf58

…ew to capture bounds","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/system_fonts.rs

{"schema":"maestro/commit/1","summary":"probe fallback fonts until th…

4a1488f

…e budget is exhausted","authority":"manual","breaking":false}

{"schema":"maestro/commit/1","summary":"derive mac toolbar startup wi…

ea278d3

…dth from live tool layouts","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay/window_runtime.rs Outdated

{"schema":"maestro/commit/1","summary":"make toolbar startup sizing c…

2a3fafa

…ompile across platforms","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs Outdated

{"schema":"maestro/commit/1","summary":"hide text overlays during act…

9b17d8d

…ive scroll capture","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/system_fonts.rs

{"schema":"maestro/commit/1","summary":"bound startup font probes aft…

2c6cbb7

…er failed coverage loads","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay/window_runtime.rs Outdated

Comment thread packages/rsnap-overlay/src/overlay.rs Outdated

{"schema":"maestro/commit/1","summary":"fix toolbar startup sizing an…

7c75a2e

…d reuse brush export scratch","authority":"manual","breaking":false}

{"schema":"maestro/commit/1","summary":"guard macos cursor rect helpe…

4070ca0

…r behind target cfg","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs

{"schema":"maestro/commit/1","summary":"cover text mode in toolbar st…

99ca193

…artup sizing","authority":"manual","breaking":false}

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

Comment thread packages/rsnap-overlay/src/overlay.rs

{"schema":"maestro/commit/1","summary":"disable text mode during scro…

8f6560e

…ll capture","authority":"manual","breaking":false}

yvette-carlisle added this pull request to the merge queue Apr 10, 2026

Merged via the queue into main with commit e824bac Apr 10, 2026
7 checks passed

yvette-carlisle deleted the feat/text-tool branch April 10, 2026 12:33

	if is_mode_tool {
	toolbar_state.selected_tool = tool;
	} else {
	toolbar_state.pending_action = Some(tool);

Conversation

yvette-carlisle commented Apr 8, 2026

Summary

Testing

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yvette-carlisle commented Apr 10, 2026

Uh oh!