Fix bevy_ui compile error when bevy_picking feature is disabled
#15053
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
IQuick143
added
A-UI
ickshonpe
approved these changes
Sep 5, 2024
alice-i-cecile
requested changes
Sep 5, 2024
alice-i-cecile
added
S-Waiting-on-Author
alice-i-cecile
approved these changes
Sep 5, 2024
alice-i-cecile
added
S-Ready-For-Final-Review
BD103
pushed a commit
to BD103/bevy
that referenced
this pull request
Sep 9, 2024
…evyengine#15053) # Objective bevyengine#14957 added the `pick_rounded_rect` function to `bevy_ui` in the `picking_backend` module, which is gated behind the `bevy_picking` feature. This function is used in that module, as well as in the `focus` module. The latter usage is not gated behind the `bevy_picking` feature, causing a compile error when the feature is disabled. ## Solution Move the `pick_rounded_rect` function out of the `picking_backend` module, as it does not depend on anything defined in that module. I put it in `lib.rs` but it could reasonably be moved somewhere else instead. ## Testing Encountered this compile error in a project and confirmed that this patch fixes it.
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.
Objective
#14957 added the
pick_rounded_rectfunction tobevy_uiin thepicking_backendmodule, which is gated behind thebevy_pickingfeature. This function is used in that module, as well as in thefocusmodule. The latter usage is not gated behind thebevy_pickingfeature, causing a compile error when the feature is disabled.Solution
Move the
pick_rounded_rectfunction out of thepicking_backendmodule, as it does not depend on anything defined in that module. I put it inlib.rsbut it could reasonably be moved somewhere else instead.Testing
Encountered this compile error in a project and confirmed that this patch fixes it.