feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix maskToColorAndAlpha()

Browse Source 
This produced wrong disabled icons on some platforms.

Change-Id: I3a80ac7f5e1fd5027d665e5791df802c78e2113a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-01-07 12:13:40 +01:00
parent 2c6d7519a0
commit d661d4a188
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/icon.cpp
View File

@@ -50,9 +50,9 @@ static QPixmap maskToColorAndAlpha(const QPixmap &mask, const QColor &color)
QRgb *bitsStart = reinterpret_cast<QRgb*>(result.bits()); QRgb *bitsStart = reinterpret_cast<QRgb*>(result.bits());
const QRgb *bitsEnd = bitsStart + result.width() * result.height(); const QRgb *bitsEnd = bitsStart + result.width() * result.height();
const QRgb tint = color.rgb() & 0x00ffffff; const QRgb tint = color.rgb() & 0x00ffffff;
const qreal alpha = color.alphaF(); const QRgb alpha = QRgb(color.alpha());
for (QRgb *pixel = bitsStart; pixel < bitsEnd; ++pixel) { for (QRgb *pixel = bitsStart; pixel < bitsEnd; ++pixel) {
QRgb pixelAlpha = ~(*pixel & 0xff) * alpha; QRgb pixelAlpha = (((~*pixel) & 0xff) * alpha) >> 8;
*pixel = (pixelAlpha << 24) | tint; *pixel = (pixelAlpha << 24) | tint;
} }
return QPixmap::fromImage(result); return QPixmap::fromImage(result);