iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/CDrummond/cantata

Browse Source
This commit is contained in:
Craig Drummond
2016-01-24 14:24:13 +00:00
parent 8b456ba817 5982c5aad9
commit d8e1a826c2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
support/monoicon.cpp
View File

@@ -87,6 +87,11 @@ public:
scale=1.05;
}
break;
case FontAwesome::bars:
if (rect.height()>18 && !Utils::isHighDpi()) {
scale=0.95;
}
break;
default:
break;
}
@@ -115,7 +120,7 @@ public:
QString str=QString::number(fontAwesomeIcon);
p.drawText(QRect(0, 0, rect.width(), rect.height()), str, QTextOption(Qt::AlignHCenter|Qt::AlignVCenter));
p.drawText(QRect(1, 0, rect.width(), rect.height()), str, QTextOption(Qt::AlignHCenter|Qt::AlignVCenter));
#ifndef Q_OS_MAC
#if !defined Q_OS_MAC && !defined Q_OS_WIN
p.drawText(QRect(-1, 0, rect.width(), rect.height()), str, QTextOption(Qt::AlignHCenter|Qt::AlignVCenter));
#endif
} else {

7
windows/cantata.nsi.cmake
View File

@@ -138,22 +138,15 @@ section "install"
file "icons\cantata\index.theme"
file "icons\cantata\LICENSE"
file "icons\cantata\AUTHORS"
setOutPath $INSTDIR\icons\cantata\128
file "icons\cantata\128\media-optical.png"
setOutPath $INSTDIR\icons\cantata\64
file "icons\cantata\64\media-optical.png"
file "icons\cantata\64\cantata.png"
setOutPath $INSTDIR\icons\cantata\48
file "icons\cantata\48\media-optical.png"
file "icons\cantata\48\cantata.png"
setOutPath $INSTDIR\icons\cantata\32
file "icons\cantata\32\media-optical.png"
file "icons\cantata\32\cantata.png"
setOutPath $INSTDIR\icons\cantata\22
file "icons\cantata\22\media-optical.png"
file "icons\cantata\22\cantata.png"
setOutPath $INSTDIR\icons\cantata\16
file "icons\cantata\16\media-optical.png"
file "icons\cantata\16\cantata.png"
setOutPath $INSTDIR\icons\cantata\svg
file "icons\cantata\svg\audio-x-generic.svg"