mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6457 from nextcloud/theming-favicon-invert-apps 

Invert themed favicons on bright colors
This commit is contained in:
Morris Jobke 2017-09-13 10:48:33 +02:00 committed by GitHub
parent 5ce3c7003b 9a47b25f19
commit 241579587a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/theming/lib/IconBuilder.php
View File

@ -58,7 +58,7 @@ class IconBuilder {
if ($icon === false) {
return false;
}
$icon->setImageFormat("png24");
$icon->setImageFormat("png32");
$data = $icon->getImageBlob();
$icon->destroy();
return $data;
@ -77,7 +77,7 @@ class IconBuilder {
if ($icon === false) {
return false;
}
$icon->setImageFormat("png24");
$icon->setImageFormat("png32");
$data = $icon->getImageBlob();
$icon->destroy();
return $data;
@ -145,6 +145,17 @@ class IconBuilder {
$appIconFile->setResolution($resX, $resY);
$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
$appIconFile->readImageBlob($svg);
/**
* invert app icons for bright primary colors
* the default nextcloud logo will not be inverted to black
*/
if ($this->util->invertTextColor($color)
&& !$appIcon instanceof ISimpleFile
&& $app !== "core"
) {
$appIconFile->negateImage(false);
}
$appIconFile->scaleImage(512, 512, true);
} else {
$appIconFile = new Imagick();
@ -162,8 +173,6 @@ class IconBuilder {
$offset_w = 512 / 2 - $innerWidth / 2;
$offset_h = 512 / 2 - $innerHeight / 2;
$appIconFile->setImageFormat("png24");
$finalIconFile = new Imagick();
$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
$finalIconFile->readImageBlob($background);