Keep event annotations attached to their node across tree mutations#7538
Open
Goober5000 wants to merge 1 commit into
Open
Keep event annotations attached to their node across tree mutations#7538Goober5000 wants to merge 1 commit into
Goober5000 wants to merge 1 commit into
Conversation
Event annotations cache the tree item they point to as a handle (HTREEITEM in FRED, QTreeWidgetItem* in qtFRED). The handle was silently invalidated whenever the tree control deleted-and-recreated an item, so annotations got decoupled. Fix: notify when a node's handle changes. move_branch reports old->new, and free_node2 / the root-delete path report old->null (deleted). The event tree remaps the annotation's handle to follow a move, or clears it on delete (the path is left intact, so a cleared annotation is dropped at save but survives a Cancel). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Goober5000
force-pushed
the
fix/annotations
branch
from
a390a80 to
2a50cc5
Compare
wookieejedi
added
the
Point Release Candidate
Contributor
Author
|
This can be added as a 26.0.1 PR, but the SEXP tree refactor means that it'll have to be rebased and reworked for post-26.0. To preserve both options, I'll open a parallel PR. Ideally, this PR should be targeted to merge to the 26_0_1 branch (whenever we create it) instead of master. |
Contributor
Author
|
Post-26.0 PR created as #7595; this PR can be merged to a 26.01 branch if we make one. |
wookieejedi
approved these changes
Jul 11, 2026
JohnAFernandez
requested changes
Jul 12, 2026
Contributor
|
Hold on, I think the the point release branch is missing two PRs. |
JohnAFernandez
force-pushed
the
pr_26_0_1
branch
from
86c3aed to
f671153
Compare
Contributor
Author
The event annotation fix should be independent of both. |
Contributor
|
Ok, pr_26_0_1 has been correctly rebased and the unrelated changes are not appearing on the PR anymore. |
JohnAFernandez
approved these changes
Jul 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Event annotations cache the tree item they point to as a handle (HTREEITEM in FRED, QTreeWidgetItem* in qtFRED). The handle was silently invalidated whenever the tree control deleted-and-recreated an item, so annotations got decoupled.
Fix: notify when a node's handle changes. move_branch reports old->new, and free_node2 / the root-delete path report old->null (deleted). The event tree remaps the annotation's handle to follow a move, or clears it on delete (the path is left intact, so a cleared annotation is dropped at save but survives a Cancel).
In draft for now as this involves changes to sexp_tree.