foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-10 10:52:31 -05:00
Code Issues Activity

[QT] don't colorize icons on win and mac

Browse source
This commit is contained in:
Jonas Schnelli 2015-05-06 17:07:22 +02:00
parent 7247d103ff
commit ca5f688547
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/qt/scicon.cpp
View file

@ -27,12 +27,17 @@ static void MakeSingleColorImage(QImage& img, const QColor& colorbase)
QImage SingleColorImage(const QString& filename, const QColor& colorbase) QImage SingleColorImage(const QString& filename, const QColor& colorbase)
{ {
QImage img(filename); QImage img(filename);
#if !defined(WIN32) && !defined(MAC_OSX)
MakeSingleColorImage(img, colorbase); MakeSingleColorImage(img, colorbase);
#endif
return img; return img;
} }
QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase) QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
{ {
#if defined(WIN32) || defined(MAC_OSX)
return ico;
#else
QIcon new_ico; QIcon new_ico;
QSize sz; QSize sz;
Q_FOREACH(sz, ico.availableSizes()) Q_FOREACH(sz, ico.availableSizes())
@ -42,6 +47,7 @@ QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
new_ico.addPixmap(QPixmap::fromImage(img)); new_ico.addPixmap(QPixmap::fromImage(img));
} }
return new_ico; return new_ico;
#endif
} }
QIcon SingleColorIcon(const QString& filename, const QColor& colorbase) QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
@ -51,6 +57,9 @@ QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
QColor SingleColor() QColor SingleColor()
{ {
#if defined(WIN32) || defined(MAC_OSX)
return QColor(0,0,0);
#else
const QColor colorHighlightBg(QApplication::palette().color(QPalette::Highlight)); const QColor colorHighlightBg(QApplication::palette().color(QPalette::Highlight));
const QColor colorHighlightFg(QApplication::palette().color(QPalette::HighlightedText)); const QColor colorHighlightFg(QApplication::palette().color(QPalette::HighlightedText));
const QColor colorText(QApplication::palette().color(QPalette::WindowText)); const QColor colorText(QApplication::palette().color(QPalette::WindowText));
@ -61,6 +70,7 @@ QColor SingleColor()
else else
colorbase = colorHighlightFg; colorbase = colorHighlightFg;
return colorbase; return colorbase;
#endif
} }
QIcon SingleColorIcon(const QString& filename) QIcon SingleColorIcon(const QString& filename)