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

Rich text #1245

Merged
merged 18 commits into from
Jan 25, 2021
Merged

Rich text #1245

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
61fad5a
got rich text working with minimal changes
tigregalis Jan 14, 2021
efa2dcf
updating examples in progress
tigregalis Jan 14, 2021
ac8133b
updated all examples
tigregalis Jan 14, 2021
2243d8c
minor change
tigregalis Jan 14, 2021
ac76dc0
clippy
tigregalis Jan 14, 2021
477ed3d
fix pipeline.rs scale
tigregalis Jan 15, 2021
cd7eb8b
added `BasicText` with the old API
tigregalis Jan 15, 2021
3b23232
added note about font atlas debug example
tigregalis Jan 15, 2021
55e6caa
no_run -> compile_fail
tigregalis Jan 15, 2021
ccd2bff
updated doctests for BasicText - thanks @mockersf
tigregalis Jan 16, 2021
a1ea650
moved font into TextStyle
tigregalis Jan 17, 2021
b182c49
moved TextStyle + TextAlignment from draw.rs to text.rs
tigregalis Jan 17, 2021
c82098c
updated text example to better document new API
tigregalis Jan 17, 2021
dfaeeb2
contributors example w/ brighter (readable) colours
tigregalis Jan 18, 2021
9817ac7
replaced BasicText with Text::with_section
tigregalis Jan 24, 2021
ba60fd4
clippy
tigregalis Jan 24, 2021
001f002
fixed text not compiling in alien_cake_addict example
tigregalis Jan 24, 2021
b61d669
removed unnecessary dev-dependency
tigregalis Jan 24, 2021
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
fix pipeline.rs scale
  • Loading branch information
@tigregalis
tigregalis committed Jan 24, 2021
commit 477ed3d70b543197d2142b85c92cb8fe7a03d119
2 changes: 1 addition & 1 deletion crates/bevy_text/src/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl<ID: Hash + Eq> TextPipeline<ID> {

let section = SectionText {
font_id,
scale: PxScale::from(section.style.font_size),
scale: PxScale::from(font_size),
text: &section.value,
};

Expand Down