mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-01 01:51:43 +02:00
Code Issues Releases Wiki Activity

Refactor/remove AbstractTextModifier::lineWidth()

Browse Source
This commit is contained in:
Oliver Vogel
2024-02-03 10:26:21 +01:00
parent ad8058f5be
commit 7b24205370
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Drivers/AbstractTextModifier.php
View File

@@ -10,7 +10,6 @@ use Intervention\Image\Geometry\Rectangle;
use Intervention\Image\Interfaces\FontInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Typography\TextBlock;
use Intervention\Image\Typography\Line;
/**
* @property FontInterface $font
@@ -62,21 +61,25 @@ abstract class AbstractTextModifier extends DriverSpecialized implements Modifie
* @param string $text
* @return TextBlock
*/
public function alignedTextBlock(Point $position, string $text): TextBlock
public function alignedTextBlock(Point $position, string $text, ?int $width = null): TextBlock
{
$lines = new TextBlock($text);
// wrap lines
$lines = $lines->wrap($width);
$boundingBox = $this->boundingBox($lines, $position);
$pivot = $boundingBox->last();
$leading = $this->leadingInPixels();
$blockWidth = $this->lineWidth($lines->longestLine());
$blockWidth = $this->boxSize((string) $lines->longestLine())->width();
$x = $pivot->x();
$y = $this->font->hasFilename() ? $pivot->y() + $this->capHeight() : $pivot->y();
$x_adjustment = 0;
foreach ($lines as $line) {
$line_width = $this->lineWidth($line);
$line_width = $this->boxSize((string) $line)->width();
$x_adjustment = $this->font->alignment() == 'left' ? 0 : $blockWidth - $line_width;
$x_adjustment = $this->font->alignment() == 'right' ? intval(round($x_adjustment)) : $x_adjustment;
$x_adjustment = $this->font->alignment() == 'center' ? intval(round($x_adjustment / 2)) : $x_adjustment;
@@ -103,7 +106,7 @@ abstract class AbstractTextModifier extends DriverSpecialized implements Modifie
// bounding box
$box = (new Rectangle(
$this->lineWidth($block->longestLine()),
$this->boxSize((string) $block->longestLine())->width(),
$this->leadingInPixels() * ($block->count() - 1) + $this->capHeight()
));
@@ -118,15 +121,4 @@ abstract class AbstractTextModifier extends DriverSpecialized implements Modifie
return $box;
}
/**
* Calculates the width of the given line in pixels
*
* @param Line $line
* @return int
*/
private function lineWidth(Line $line): int
{
return $this->boxSize((string) $line)->width();
}
}