Browse Source

Qt: Go back to using QIcon functionality for scaling

pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
8e76ca0429
  1. 58
      src/qt/networkstyle.cpp
  2. 6
      src/qt/networkstyle.h
  3. 3
      src/qt/splashscreen.cpp

58
src/qt/networkstyle.cpp

@ -24,52 +24,13 @@ static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*netw @@ -24,52 +24,13 @@ static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*netw
// titleAddText needs to be const char* for tr()
NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText):
appName(appName),
iconColorHueShift(iconColorHueShift),
iconColorSaturationReduction(iconColorSaturationReduction),
titleAddText(qApp->translate("SplashScreen", titleAddText))
{
}
const NetworkStyle *NetworkStyle::instantiate(const QString &networkId)
{
for (unsigned x=0; x<network_styles_count; ++x)
{
if (networkId == network_styles[x].networkId)
{
return new NetworkStyle(
network_styles[x].appName,
network_styles[x].iconColorHueShift,
network_styles[x].iconColorSaturationReduction,
network_styles[x].titleAddText);
}
}
return 0;
}
QIcon NetworkStyle::getAppIcon() const
{
return getAppIcon(QSize(256,256));
}
QIcon NetworkStyle::getAppIcon(const QSize size) const
{
// load pixmap
QPixmap pixmap(":/icons/bitcoin");
if(pixmap.size().width() != size.width() && pixmap.size().height() != size.height())
{
QPixmap scaledPixmap = pixmap.scaled(size, Qt::KeepAspectRatio);
if(!scaledPixmap.isNull())
{
pixmap = scaledPixmap;
}
}
if(iconColorHueShift != 0 && iconColorSaturationReduction != 0)
{
// copy the pixmap because on linux the original pixmap will be affected
pixmap = pixmap.copy();
// generate QImage from QPixmap
QImage img = pixmap.toImage();
@ -110,6 +71,21 @@ QIcon NetworkStyle::getAppIcon(const QSize size) const @@ -110,6 +71,21 @@ QIcon NetworkStyle::getAppIcon(const QSize size) const
pixmap.convertFromImage(img);
}
QIcon icon(pixmap);
return icon;
appIcon = QIcon(pixmap);
}
const NetworkStyle *NetworkStyle::instantiate(const QString &networkId)
{
for (unsigned x=0; x<network_styles_count; ++x)
{
if (networkId == network_styles[x].networkId)
{
return new NetworkStyle(
network_styles[x].appName,
network_styles[x].iconColorHueShift,
network_styles[x].iconColorSaturationReduction,
network_styles[x].titleAddText);
}
}
return 0;
}

6
src/qt/networkstyle.h

@ -17,16 +17,14 @@ public: @@ -17,16 +17,14 @@ public:
static const NetworkStyle *instantiate(const QString &networkId);
const QString &getAppName() const { return appName; }
const QIcon &getAppIcon() const { return appIcon; }
const QString &getTitleAddText() const { return titleAddText; }
QIcon getAppIcon() const;
QIcon getAppIcon(const QSize size) const;
private:
NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText);
QString appName;
int iconColorHueShift;
int iconColorSaturationReduction;
QIcon appIcon;
QString titleAddText;
};

3
src/qt/splashscreen.cpp

@ -67,8 +67,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) @@ -67,8 +67,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
QRect rectIcon(QPoint(-150,-122), QSize(430,430));
const QSize requiredSize(1024,1024);
QIcon appIcon = networkStyle->getAppIcon(requiredSize);
QPixmap icon(appIcon.pixmap(requiredSize));
QPixmap icon(networkStyle->getAppIcon().pixmap(requiredSize));
pixPaint.drawPixmap(rectIcon, icon);

Loading…
Cancel
Save