Repository navigation
[vector_graphics_compiler] Fix em units in text positions - #13388
rohanjariwala03 wants to merge 6 commits into
Conversation
Text `x`, `y`, `dx` and `dy` values in `em` were parsed with the unit stripped, so `dy=".35em"` moved the text by 0.35 pixels. They are now multiplied by the element's font size, falling back to the same default of 16 used when drawing the text. Fixes flutter/flutter#158758
There was a problem hiding this comment.
Code Review
This pull request introduces support for 'em' units in SVG text positions (x, y, dx, dy) by updating the DoubleOrPercentage class to parse and calculate values relative to the font size. Feedback suggests converting the parsed string to lowercase to ensure case-insensitive matching of the 'em' unit.
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
# Conflicts: # packages/vector_graphics_compiler/CHANGELOG.md
|
@gaaclarke Thanks for the review! Merged upstream. Since 1.3.3 is now the coordinate list change, I moved this entry to 1.3.4. |
|
@flar can you be a second review on this please? |
flar
left a comment
There was a problem hiding this comment.
Mostly LGTM, but there's a nit that I'd like to hear back about...
| } | ||
| return DoubleOrPercentage._(parseDouble(raw)!, false); | ||
| final String trimmed = raw.trim().toLowerCase(); | ||
| final bool isEm = trimmed.endsWith('em') && !trimmed.endsWith('rem'); |
There was a problem hiding this comment.
This feels weak in that it seems to need to exclude rem but it doesn't otherwise ensure that the value is #####em rather than #####somethingsomethingelseem. It leaves me wondering why rem was specifically chosen to be excluded, but nothing else was done to make sure the em was just an em...?
There was a problem hiding this comment.
Also, there appears to be an isPercentage method somewhere, should there be something like an isEm method?
There was a problem hiding this comment.
Fair point, rem was only excluded because it's the other unit ending in "em". I added isEm/parseEm next to the percentage helpers. isEm only matches a number followed by em, so the special case is gone. Added tests too.
Text
x,y,dxanddyvalues inemwere treated as pixels. For example,dy=".35em"withfont-size="425px"moved the text down by 0.35 pixels instead of about 149, so text centered this way was drawn too high.DoubleOrPercentage.fromStringstripped the unit withparseDouble, so anemvalue ended up the same as a plain number. Now it remembers that the value is inem, andcomputeTextPositionmultiplies it by the element's font size, including one inherited from a parent. Without a font size it useskDefaultFontSize(16), the same defaultcomputeTextConfiguses when drawing the text. The bug is invector_graphics_compiler, whichflutter_svguses to parse SVGs.Fixes flutter/flutter#158758
Pre-Review Checklist
[shared_preferences]///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.Footnotes
Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩2