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

Add CSS Grid support to bevy_ui #8026

Merged
merged 76 commits into from
Apr 17, 2023
+1,411 −167
Merged

Add CSS Grid support to bevy_ui #8026

Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
07aad3b
Enable Taffy grid feature
nicoburns Mar 10, 2023
ff6f5af
CSS Grid WIP (update alignment types)
nicoburns Mar 10, 2023
26e0803
Add GridAutoFlow style
nicoburns Mar 10, 2023
8c2c345
Add Grid variant to Display enum
nicoburns Mar 10, 2023
8f4f276
Implement GridPlacement properties
nicoburns Mar 10, 2023
b4f7b9a
Implement GridTrack type
nicoburns Mar 10, 2023
92cfb4a
Ignore fields that are problematic for reflection
nicoburns Mar 10, 2023
c92d8a7
Fix conversion of grid track lists
nicoburns Mar 10, 2023
ad7b087
cargo fmt
nicoburns Mar 10, 2023
437c55b
Remove const modifier from with_style function
nicoburns Mar 10, 2023
25ed559
Add CSS Grid example
nicoburns Mar 10, 2023
3d5e948
Add metadata to example
nicoburns Mar 10, 2023
d8a9d6b
Fix example metadata (take 2)
nicoburns Mar 10, 2023
c836762
Fix reflection of Style struct
nicoburns Mar 10, 2023
8b569a7
Make default window size of grid example smaller
nicoburns Mar 10, 2023
458abbc
Format example
nicoburns Mar 10, 2023
1b6b271
Update example docs
nicoburns Mar 10, 2023
58d0a18
Fix position:absolute node not displaying
nicoburns Mar 10, 2023
a5c15a2
Apply suggestions from code review
nicoburns Mar 10, 2023
414f154
Update crates/bevy_ui/src/ui_node.rs
nicoburns Mar 10, 2023
5a3c8f0
Rename Normal variants to Default
nicoburns Mar 10, 2023
e189f12
Ensure that grid style values are scaled when converting to taffy styles
nicoburns Mar 11, 2023
0a67774
Add support for repeated track definitions
nicoburns Mar 11, 2023
cfeff47
Use method rather than static function for repeating
nicoburns Mar 11, 2023
49d9424
Add constructors for min-content, max-content, and fit-content grid t…
nicoburns Mar 11, 2023
40eee01
Add constructor for minmax() grid tracks
nicoburns Mar 11, 2023
e57fa7e
Merge branch 'main' into css-grid
nicoburns Mar 13, 2023
726329d
Fix convert test
nicoburns Mar 13, 2023
9beb563
Add documentation to grid example
nicoburns Mar 13, 2023
d2016de
Redo grid example
nicoburns Mar 13, 2023
faee682
Clean up example
nicoburns Mar 13, 2023
e183caf
Document grid example
nicoburns Mar 13, 2023
d38dd22
cargo fmt
nicoburns Mar 13, 2023
8633918
Simplify text spawning
nicoburns Mar 13, 2023
b73c6c0
Remove FlexStart and FlexEnd variants from JustifyItems/JustifySelf a…
nicoburns Mar 13, 2023
e209d59
Improve documentation of Style struct
nicoburns Mar 13, 2023
9533721
Document RepeatedGridTrack
nicoburns Mar 13, 2023
4947f1f
Fix missing backticks in docstring
nicoburns Mar 14, 2023
33dc75d
Update API for repeated grid tracks
nicoburns Mar 14, 2023
7bd9471
Add From<usize> impl for GridTrackRepetition
nicoburns Mar 14, 2023
b75e576
Fixing / in doc comment
nicoburns Mar 14, 2023
3c46510
Update crates/bevy_ui/src/ui_node.rs
nicoburns Mar 14, 2023
3f568e1
Impl From<i32> for GridTrackRepetition + fix test
nicoburns Mar 14, 2023
78931a1
Fix clippy lints
nicoburns Mar 14, 2023
ad9c4e8
More lint fixes
nicoburns Mar 14, 2023
0029667
Fix missing backticks in doc comment
nicoburns Mar 14, 2023
2a4621a
Merge branch 'main' into css-grid
nicoburns Mar 15, 2023
3570782
Flatten MinTrackSizingFunction and MaxTrackSizingFunction enums
nicoburns Mar 15, 2023
8982201
Make it possible to repeat multiple grid tracks
nicoburns Mar 15, 2023
e74f819
Appease clippy
nicoburns Mar 15, 2023
f6402c5
cargo fmt
nicoburns Mar 15, 2023
3b12180
Expose full grid placement model to bevy
nicoburns Mar 15, 2023
887b640
Add links to MDN Flexbox and CSS Grid guides
nicoburns Mar 15, 2023
5468190
Improve docs of GridTrack
nicoburns Mar 16, 2023
4cc047d
Fix link formatting on GridAutoFlow
nicoburns Mar 16, 2023
29654df
Make all squares in example different colours
nicoburns Mar 16, 2023
bf4b2dc
Merge branch 'main' into css-grid
nicoburns Mar 21, 2023
89988b5
Merge branch 'main' into css-grid
nicoburns Mar 25, 2023
6530043
Merge branch 'main' into css-grid
nicoburns Mar 28, 2023
0bdcd68
Merge branch 'main' into css-grid
nicoburns Mar 30, 2023
c6cbaa7
Bump taffy req to 0.3.10
nicoburns Mar 30, 2023
8575045
Merge branch 'main' into css-grid
nicoburns Apr 6, 2023
f14dc98
Apply suggestions from code review
nicoburns Apr 6, 2023
c220b99
Remove unsafe Send/Sync impls for FlexSurface
nicoburns Apr 6, 2023
c9c85d2
Rename flex module and types to layout/Ui as appropriate
nicoburns Apr 6, 2023
204bc2d
Register grid styles with ExtractComponentPlugin
nicoburns Apr 6, 2023
91a6a78
Fix doc references
nicoburns Apr 6, 2023
d798b5b
Merge branch 'main' into css-grid
nicoburns Apr 13, 2023
689cc23
Remove &nbsp; from docs
nicoburns Apr 13, 2023
7341c13
Mark grid and flex_layout examples as working in wasm
nicoburns Apr 13, 2023
a503bb8
Update description of style field in NodeBundle
nicoburns Apr 13, 2023
3f31332
Update description of style field in NodeBundle again
nicoburns Apr 13, 2023
1a59031
Merge branch 'main' into css-grid
nicoburns Apr 14, 2023
6079032
Merge branch 'main' into css-grid
nicoburns Apr 17, 2023
44b06e5
Merge branch 'main' into css-grid
nicoburns Apr 17, 2023
7873b52
Update description of style property for all bundles
nicoburns Apr 17, 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
Next Next commit
Enable Taffy grid feature
  • Loading branch information
@nicoburns
nicoburns committed Mar 13, 2023
commit 07aad3bb4070dfa48145908e2fcac2307757928b
2 changes: 1 addition & 1 deletion crates/bevy_ui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bevy_window = { path = "../bevy_window", version = "0.11.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }

# other
taffy = { version = "0.3.5", default-features = false, features = ["std"] }
taffy = { version = "0.3.7" }
serde = { version = "1", features = ["derive"] }
smallvec = { version = "1.6", features = ["union", "const_generics"] }
bytemuck = { version = "1.5", features = ["derive"] }
Expand Down