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.

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

Support individual corner radii for kurbo::RoundedRect #1561

Merged
merged 9 commits into from
Mar 31, 2021

Conversation

SecondFlight
Copy link
Collaborator

@SecondFlight SecondFlight commented Feb 3, 2021

Depends on kurbo#166 and piet#391. This PR should not be merged until the upstream crates are updated and this PR is pointed to them. The changes in Kurbo are (mostly) backwards-compatible, so very little needs to change in Druid to incorporate the upstream changes.

image

@SecondFlight SecondFlight changed the title Rounded rect corners Support individual corner radii for kurbo::RoundedRect Feb 8, 2021
@cmyr cmyr added the S-blocked waits for another PR or dependency label Feb 15, 2021
@cmyr cmyr added this to the piet-4.0 milestone Mar 18, 2021
@cmyr cmyr removed the S-blocked waits for another PR or dependency label Mar 30, 2021
@cmyr
Copy link
Member

cmyr commented Mar 30, 2021

@SecondFlight this should now be mergeable?

@SecondFlight
Copy link
Collaborator Author

Yeah, I just need to fix merge conflicts and do a smoke test.

@SecondFlight
Copy link
Collaborator Author

Did I accidentally float these changes into Druid in another PR?? The change set no longer includes the changes needed for this PR, but the code works and so I think the changes are somehow already on master.

@SecondFlight
Copy link
Collaborator Author

SecondFlight commented Mar 30, 2021

Ah nevermind, they were added here which makes total sense. I'll mark this ready for review, but there's not much to review; the only thing left relating to the rounded rect change is the updated changelog. I made a .gitignore change that I would like to see merged, as it brings this repo in line with piet and ignores a few thousand files that my rust language server is generating.

@SecondFlight SecondFlight marked this pull request as ready for review March 30, 2021 21:45
Copy link
Member

@cmyr cmyr left a comment

Choose a reason for hiding this comment

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

Ah right, I needed to impl this in order for the existing code to compile. 😁

@SecondFlight SecondFlight merged commit 120692f into linebender:master Mar 31, 2021
@SecondFlight SecondFlight deleted the rounded-rect-corners branch March 31, 2021 17:16
richard-uk1 pushed a commit to richard-uk1/druid that referenced this pull request Apr 6, 2021
* Ignore all /target/ folders

* Update Data impl for RoundedRect

* Just ignore all folders matching **/target, which matches Piet's gitignore

* Bump kurbo version to 0.8.0

* Update CHANGELOG.md

Co-authored-by: Joshua Wade <joshua_wade@selinc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants