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

add egui-material-icons & move workspace dependencies #38

Merged
merged 10 commits into from
Oct 1, 2024
Merged

add egui-material-icons & move workspace dependencies #38

merged 10 commits into from
Oct 1, 2024

Conversation

bircni
Copy link
Contributor

@bircni bircni commented Oct 1, 2024

No description provided.

@bircni bircni marked this pull request as draft October 1, 2024 12:34
lucasmerlin
lucasmerlin approved these changes Oct 1, 2024
View reviewed changes
Copy link
Owner

@lucasmerlin lucasmerlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Moving egui-material-icons here makes total sense. And moving shared dependencies to the root Cargo.toml is great, too.

Please split this in two PRs next time, which would make it a lot easier to review

src/lib.rs Outdated Show resolved Hide resolved
@bircni
Copy link
Contributor Author

bircni commented Oct 1, 2024

Sorry for not splitting up sorry :-/

@bircni
Copy link
Contributor Author

bircni commented Oct 1, 2024

image

@bircni
Copy link
Contributor Author

bircni commented Oct 1, 2024

FYI:
Windows uses \r\n for newlines, while Linux and macOS use \n. As the include_str!("../MaterialSymbolsRounded-Regular.codepoints") file was created on a Unix-like system, the split might leave \r at the end of each line on Windows, causing issues during parsing.

thats why the new proc-macro was failing on windows

bircni added 2 commits October 1, 2024 20:38
@bircni
fix proc_macro error
861fd94
@bircni
renaming examples
67b9b13 
Fixes: The example target `virtual_list` in package `egui_virtual_list v0.4.0 (D:\a\hello_egui\hello_egui\crates\egui_virtual_list)` has the same output filename as the example target `virtual_list` in package `egui_dnd v0.9.1 (D:\a\hello_egui\hello_egui\crates\egui_dnd)`.
Colliding filename is: D:\a\hello_egui\hello_egui\target\debug\examples\virtual_list.pdb
The targets should have unique names.
Consider changing their names to be unique or compiling them separately.
This may become a hard error in the future; see <rust-lang/cargo#6313>.
@bircni bircni marked this pull request as ready for review October 1, 2024 18:59
@bircni
Copy link
Contributor Author

bircni commented Oct 1, 2024

@lucasmerlin halleluja all ci things fixed!

@lucasmerlin
Copy link
Owner

Awesome, thank you!

@lucasmerlin lucasmerlin merged commit 1ae058c into lucasmerlin:main Oct 1, 2024
4 checks passed
@bircni
Copy link
Contributor Author

bircni commented Oct 1, 2024

Time for an update to crates?

@bircni bircni deleted the additions branch October 1, 2024 21:31
@lucasmerlin
Copy link
Owner

Yes definitely, I plan to release a new version tomorrow after doing some finishing touches to egui_flex

@bircni bircni mentioned this pull request Oct 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucasmerlin lucasmerlin lucasmerlin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bircni @lucasmerlin