Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Implement property functions for line-join, text-justify, text-anchor #9583

Merged
merged 7 commits into from
Jul 26, 2017

Conversation

lbud
Copy link
Contributor

@lbud lbud commented Jul 21, 2017

I started down the path of porting mapbox/mapbox-gl-js#5020 to native, but because of the spec-based generated code figured I may as well port mapbox/mapbox-gl-js#4997 and mapbox/mapbox-gl-js#5000 here as well.

Closes #9555.
Closes #9559.

This is based on the gl-js SHA in mapbox/mapbox-gl-js#5020 — remaining TODO here is to update the sdk-support tables in gl-js for these properties.

@@ -195,13 +195,62 @@ std::set<std::size_t> determineLineBreaks(const std::u16string& logicalInput,
return leastBadBreaks(evaluateBreak(logicalInput.size(), currentX, targetWidth, potentialBreaks, 0, true));
}

struct AnchorAlignment {
Copy link
Contributor

Choose a reason for hiding this comment

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

Since this struct is only used as a temporary variable on the stack, how about just inlining getAnchorAlignment where it's used and replacing the AnchorAlignment variable with separate horizontalAlign and verticalAlign variables?

@kkaefer kkaefer added Core The cross-platform C++ core, aka mbgl rendering labels Jul 24, 2017
Copy link
Contributor

@ChrisLoer ChrisLoer left a comment

Choose a reason for hiding this comment

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

I only got a chance to look at this briefly, but looks good to me!

@jfirebaugh
Copy link
Contributor

I added ignores for DDS line-join tests in #9612 so you'll want to un-ignore those when you rebase.

@lbud
Copy link
Contributor Author

lbud commented Jul 26, 2017

I also un-ignored line-width/property-function when updating the ignores.json file — I noticed was still being ignored despite being supported in mapbox-gl-native now.

@lbud lbud merged commit a8ef2af into master Jul 26, 2017
@lbud lbud deleted the dds-ports branch July 26, 2017 20:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Core The cross-platform C++ core, aka mbgl rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants