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

Update font-kit. #126

Merged
merged 1 commit into from
May 13, 2020
Merged

Update font-kit. #126

merged 1 commit into from
May 13, 2020

Conversation

jdm
Copy link
Contributor

@jdm jdm commented Apr 7, 2020

This shouldn't be merged until there's a new font-kit release, but I wanted to be sure that I don't lose these change.

@@ -771,13 +773,15 @@ impl DrawTarget {
let bounds = font.raster_bounds(
*id,
point_size,
&fk::FontTransform::new(self.transform.m11, self.transform.m21, self.transform.m12, self.transform.m22),
&(self.transform.transform_point(*position)),
Transform2F::row_major(self.transform.m11, self.transform.m12, self.transform.m21, self.transform.m22, 0., 0.).translate(Vector2F::new(position.x, position.y)),
Copy link
Contributor Author

@jdm jdm Apr 7, 2020

Choose a reason for hiding this comment

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

I honestly have no idea if this is the correct way to write this.

Copy link
Owner

Choose a reason for hiding this comment

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

Does @pcwalton know?

Copy link

@pcwalton pcwalton Apr 8, 2020

Choose a reason for hiding this comment

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

Looks right to me. (BTW, master branch pathfinder_geometry has a vec2f() shortcut for Vector2F::new().)

@@ -798,8 +802,7 @@ impl DrawTarget {
&mut canvas,
*id,
point_size,
&fk::FontTransform::new(self.transform.m11, self.transform.m21, self.transform.m12, self.transform.m22),
&position,
Transform2F::row_major(self.transform.m11, self.transform.m12, self.transform.m21, self.transform.m22, 0., 0.).translate(Vector2F::new(position.x, position.y)),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same here.

@atouchet
Copy link
Contributor

font-kit 0.6 is now out.

@jdm
Copy link
Contributor Author

jdm commented May 12, 2020

This is now in a state where it can be merged.

@jdm jdm changed the title Update to latest font-kit changes Update to font-kit 0.6 May 12, 2020
@atouchet
Copy link
Contributor

Can this be updated to font-kit 0.7?

@jdm jdm changed the title Update to font-kit 0.6 Update font-kit. May 12, 2020
@jdm
Copy link
Contributor Author

jdm commented May 12, 2020

Done.

@jrmuizel jrmuizel merged commit 517cce6 into jrmuizel:master May 13, 2020
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.

4 participants