dev/core#343 Fix long address lines overflowing label #12691
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
generateLabel() - Width did not take into account paddingLeft
|
(Standard links)
|
andrewpthompson
changed the title
|
Tested, works as described. Good to merge. |
CRM/Utils/PDF/Label.php
Outdated
| @@ -185,7 +185,7 @@ public function LabelSetFormat(&$format, $unit) { | |||
| */ | |||
| public function generateLabel($text) { | |||
| $args = array( | |||
| 'w' => $this->width, | |||
| 'w' => $this->width - 2 * $this->paddingLeft, | |||
There was a problem hiding this comment.
2 is a magic number here. Could you please add a comment explaining why this change works? Thanks!
|
Thanks @MegaphoneJon and @aydun for the feedback. I've added a comment in response to Jon's review comment (good point). |
|
I feel review here is adequate - merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
When a name or address is very long (long enough for the text to wrap onto a new line) it overflows the label. This can be seen by comparing the PDF output by CiviCRM with an official Avery template. This fixes that by modifying
CRM_Utils_PDF_Label::generateLabel()so that the width that it uses has the left & right padding subtracted from the label's width.Before
Long lines can overflow the label boundary.
After
Long lines wrap within the label boundary with correct padding applied.
https://lab.civicrm.org/dev/core/issues/343