[3.x] Allow overriding _clips_input() for ScrollContainer and GraphEdit
#53780
+8
−0
Conversation
This file contains 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
Calinou
force-pushed
the
scrollcontainer-graphedit-allow-clips-input-script-override
branch
from
f6eba67
to
04e857a
Compare
akien-mga
reviewed
Oct 14, 2021
Comment on lines
+241
to
+243
| if (get_script_instance()) { | ||
| return get_script_instance()->call(SceneStringNames::get_singleton()->_clips_input); | ||
| } |
There was a problem hiding this comment.
Won't this break if there is a script and it does not implement _clips_input?
There was a problem hiding this comment.
It's the same as what's in scene/gui/control.cpp already, so I'd presume that it's fine, but it ought to be tested to confirm.
There was a problem hiding this comment.
Rebased against latest 3.x and tested with the mentioned use case, it works as expected. No errors appear when using a GraphEdit with a script attached that has no _clips_input() method (or when no script is attached at all).
akien-mga
force-pushed
the
3.x
branch
2 times, most recently
from
71cb8d3
to
c58391c
Compare
This is already done in Control, but the C++ method overrides didn't check for possible script overrides. Co-authored-by: Robin Gustafsson <[email protected]>
Calinou
force-pushed
the
scrollcontainer-graphedit-allow-clips-input-script-override
branch
from
04e857a
to
9cf9ff8
Compare
akien-mga
changed the title
_clips_input() for ScrollContainer and GraphEdit_clips_input() for ScrollContainer and GraphEdit
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.
This is already done in Control, but the C++ method overrides didn't check for possible script overrides.
The
masterbranch does not haveclips_input(). I don't know if a different fix is needed there (or whether it's needed at all).This closes #42889. Thanks @rgson for the implementation 🙂