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

Jump to bottom

Use taffy for tables #129

Merged
merged 15 commits into from
May 31, 2023
Merged

Use taffy for tables #129

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c109c60
WIP
trimental May 24, 2023
bfbd349
Remove local repo
trimental May 24, 2023
d6e4f12
Refactor text measure function
nicoburns May 24, 2023
d3bf1a5
Make two example tables (wrapping and non-wrapping)
nicoburns May 24, 2023
c154dca
Replace unstable default feature with default util function
nicoburns May 24, 2023
c25d406
Don't constrain height
nicoburns May 24, 2023
07e0df0
Use fixed Taffy
nicoburns May 24, 2023
59acbb5
Merge remote-tracking branch 'nicoburns/taffy-table-2' into taffy
trimental May 26, 2023
f3975b7
Touch up and simplify logic
trimental May 26, 2023
005d3d8
Wrap table in flex box
trimental May 26, 2023
bc8a35b
Merge main
trimental May 26, 2023
c0117ec
Cleaner code
trimental May 31, 2023
522c9c7
Share taffy instance and disable rounding
trimental May 31, 2023
eadd163
Merge main
trimental May 31, 2023
3bd6a43
Update dependencies
trimental May 31, 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
112 changes: 65 additions & 47 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ indexmap = { version = "1.9.3", features = ["serde"] }
html-escape = "0.2.13"
fxhash = "0.2.1"
twox-hash = "1.6.3"
taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "5443996198f02cf5a6c6493499df3cf08394a70f" }
syntect = "5.0.0"

[dependencies.glyphon]
Expand All @@ -72,4 +73,4 @@ lto = true

[dev-dependencies]
insta = "1.29.0"
pretty_assertions = "1.3.0"
pretty_assertions = "1.3.0"
Loading