hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 02:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3987: fix do not add text shadow if no shadow attribute (#4454)

Browse Source
This commit is contained in:
jygaulier
2024-01-03 18:51:05 +01:00
committed by GitHub
parent 7768ebfb4b
commit 7e42d03a24
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/recordutils/image.php
View File

@@ -289,11 +289,19 @@ class recordutils_image
$txtline = $texts->item($i)->nodeValue; $txtline = $texts->item($i)->nodeValue;
if ($txtline != '') { if ($txtline != '') {
$wrap = static::wrap($imagine, $fontsize, 0, __DIR__ . '/../../../resources/Fonts/arial.ttf', $txtline, $text_width); $shadow = $texts->item($i)->getAttribute('shadow');
if($shadow) {
$shadowColor = $xmlToColor($shadow, [0, 0, 0, 127]);
$wrap = static::wrap($imagine, $fontsize, 0, __DIR__ . '/../../../resources/Fonts/arial.ttf', $txtline, $text_width, true);
}
else {
$shadowColor = null;
$wrap = static::wrap($imagine, $fontsize, 0, __DIR__ . '/../../../resources/Fonts/arial.ttf', $txtline, $text_width, false);
}
$txtblock[] = [ $txtblock[] = [
'fontsize' => $fontsize, 'fontsize' => $fontsize,
'fontcolor' => $xmlToColor($texts->item($i)->getAttribute('color'), [0, 0, 0]), 'fontcolor' => $xmlToColor($texts->item($i)->getAttribute('color'), [0, 0, 0]),
'shadowcolor' => $xmlToColor($texts->item($i)->getAttribute('shadow'), [0, 0, 0, 127]), 'shadowcolor' => $shadowColor,
'h' => $wrap['toth'], 'h' => $wrap['toth'],
'lines' => $wrap['l'], 'lines' => $wrap['l'],
]; ];
@@ -541,9 +549,10 @@ class recordutils_image
* @param string $fontFace * @param string $fontFace
* @param string $string * @param string $string
* @param int $width * @param int $width
* @param bool $withShadow
* @return array * @return array
*/ */
protected static function wrap(ImagineInterface $imagine, $fontSize, $angle, $fontFace, $string, $width) protected static function wrap(ImagineInterface $imagine, $fontSize, $angle, $fontFace, $string, $width, $withShadow)
{ {
static $palette; static $palette;