mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

LCD: add workarounds for LCD drawing on Qt 5.6.

Browse Source 
This is a temporary workaround until we can get the issue fixed
upstream.

See mumble-voip/mumble#2429 for more information.
This commit is contained in:
Mikkel Krautz 2016-07-15 23:32:26 +02:00
parent ebbac0bbb5
commit c04aa4e882
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mumble/LCD.cpp
View File

@ -188,7 +188,14 @@ LCD::LCD() : QObject() {
d->setEnabled(enabled); d->setEnabled(enabled);
} }
qiLogo = QIcon(QLatin1String("skin:mumble.svg")).pixmap(48,48).toImage().convertToFormat(QImage::Format_MonoLSB); qiLogo = QIcon(QLatin1String("skin:mumble.svg")).pixmap(48,48).toImage().convertToFormat(QImage::Format_MonoLSB);
#if QT_VERSION >= 0x050600
// Don't invert the logo image when using Qt 5.6.
// See mumble-voip/mumble#2429
#else
qiLogo.invertPixels(); qiLogo.invertPixels();
#endif
updateUserView(); updateUserView();
} }
@ -242,7 +249,15 @@ void LCD::updateUserView() {
QImage *img = qhImages.value(size); QImage *img = qhImages.value(size);
QPainter painter(img); QPainter painter(img);
painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing, false); painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing, false);
#if QT_VERSION >= 0x050600
// Use Qt::white instead of Qt::color1 on Qt 5.6.
// See mumble-voip/mumble#2429
painter.setPen(Qt::white);
#else
painter.setPen(Qt::color1); painter.setPen(Qt::color1);
#endif
painter.setFont(qfNormal); painter.setFont(qfNormal);
img->fill(Qt::color0); img->fill(Qt::color0);