RightClickOverlay: check focus before clearing selection_pos#1367
Merged
myk002 merged 2 commits intoDFHack:masterfrom Jan 10, 2025
Merged
RightClickOverlay: check focus before clearing selection_pos#1367myk002 merged 2 commits intoDFHack:masterfrom
myk002 merged 2 commits intoDFHack:masterfrom
Conversation
Check for the relevant focus before clearing .selection_pos. Otherwise, the overlay will erroneously consume a LEAVESCREEN or right-click input in the other modes when .selection_pos.x >= 0. Note: .selection_pos is (0,0,0) after DF starts from scratch.
myk002
reviewed
Jan 9, 2025
Member
myk002
left a comment
There was a problem hiding this comment.
This solution looks fine (with the focus string check). This only runs in response to a manual action, so performance isn't really an issue here.
Could you add a line to the Fixes section in the changelog?
Contributor
Author
|
Oops! Sorry for leaving out a changelog entry. |
myk002
approved these changes
Jan 10, 2025
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
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.
I found myself sometimes needing to "exit twice" to exit out of a dig designation that didn't have a selection started.
Problem Reproduction
gui/gm-editor buildreq.selection_pos, Alt-a to enable live updates:lua ~buildreq.selection_pos:assign(xyz2pos(0,0,0))Alternate Fix
Just swapping the if and elseif mostly works okay and avoids having to do focus matching.
This works because all the components of selection_rect start at -30k in a fresh boot and this overlay makes sure the "start" components are -30k before exiting the modes that change them.
There would still be some edge cases though:
Either could create a "cancel input suppressed" situations for building placement mode.