Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NoWrap Text feature #8947

Merged
merged 14 commits into from
Jun 26, 2023
Merged

NoWrap Text feature #8947

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
56033b1
`FixedMeasure`
ickshonpe Jun 18, 2023
884e8e4
Merge branch 'main' into text-wrap-override
ickshonpe Jun 18, 2023
973e675
Removed the `TextOptions` and `TextWrapOverride` types.
ickshonpe Jun 19, 2023
ea42c27
changes:
ickshonpe Jun 24, 2023
a416864
`text_wrap_debug`:
ickshonpe Jun 24, 2023
ae48806
Merge branch 'main' into text-wrap-override
ickshonpe Jun 24, 2023
b87600c
Fix for `match-same-arms` lint.
ickshonpe Jun 24, 2023
3a08d34
Fix comment for changed code.
ickshonpe Jun 24, 2023
c4465f9
cargo fmt
ickshonpe Jun 24, 2023
d59a0f6
semicolon_if_nothing_returned
ickshonpe Jun 24, 2023
a832ee5
Added a doc comment for the `TextBundle::no_wrap` method.
ickshonpe Jun 24, 2023
672d148
Replaced `matches` with `==` in `create_text_measure.
ickshonpe Jun 26, 2023
3eb7a24
Added a `with_no_wrap` builder method to `Text`
ickshonpe Jun 26, 2023
daa4cd2
Merge branch 'bevyengine:main' into text-wrap-override
ickshonpe Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into text-wrap-override
  • Loading branch information
@ickshonpe
ickshonpe committed Jun 24, 2023
commit ae48806bfb01c2e7916160f43e5497419d5c3164
4 changes: 2 additions & 2 deletions crates/bevy_ui/src/node_bundles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use bevy_render::{
prelude::{Color, ComputedVisibility},
view::Visibility,
};
use bevy_text::BreakLineOn;
use bevy_sprite::TextureAtlas;
#[cfg(feature = "bevy_text")]
use bevy_text::{Text, TextAlignment, TextLayoutInfo, TextSection, TextStyle};
use bevy_text::{BreakLineOn, Text, TextAlignment, TextLayoutInfo, TextSection, TextStyle};
use bevy_transform::prelude::{GlobalTransform, Transform};

/// The basic UI node
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.