Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-30 15:07:34 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-09-30 15:07:34 (GMT) |
| commit | cb41a41239bd75db8a3ed6d5b3013104e393d0ad (patch) | |
| tree | ee10953bf0fee961fddcd3ff41a3ad87fd650871 /Swift | |
| parent | 9abfaaa771f91010dbe01a1b9b5b9e2801956718 (diff) | |
| download | swift-cb41a41239bd75db8a3ed6d5b3013104e393d0ad.zip swift-cb41a41239bd75db8a3ed6d5b3013104e393d0ad.tar.bz2 | |
Only scale avatars that are not embedded Qt resources
The default avatar is a embedded SVG which doesn't need to
be scaled specifically.
Test-Information:
Builds on macOS 10.12 with Qt 5.6.1 and tooltip avatars are
still shown without an error message being logged.
Change-Id: I5aff38856e97dee9133b1daf9039cabc063dc01c
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtScaledAvatarCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp index 8c37dac..37ea6a9 100644 --- a/Swift/QtUI/QtScaledAvatarCache.cpp +++ b/Swift/QtUI/QtScaledAvatarCache.cpp @@ -23,61 +23,61 @@ namespace Swift { namespace { // This number needs to be incremented whenever the avatar scaling procedure changes. const int QT_SCALED_AVATAR_CACHE_VERSION = 1; } QtScaledAvatarCache::QtScaledAvatarCache(int size) : size(size) { } static QPixmap cropToBiggestCenteredSquare(const QPixmap& input) { QPixmap squareCropped; if (input.width() != input.height()) { QRect centeredSquare; if (input.width() > input.height()) { int x = (input.width() - input.height()) / 2; centeredSquare = QRect(x, 0, input.height(), input.height()); } else { int y = (input.height() - input.width()) / 2; centeredSquare = QRect(0, y, input.width(), input.width()); } squareCropped = input.copy(centeredSquare); } else { squareCropped = input; } return squareCropped; } QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) { QFileInfo avatarFile(path); - if (avatarFile.exists()) { + if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) { QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size)); if (!avatarFile.dir().mkpath(cacheSubPath)) { SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()) << std::endl; SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath) << std::endl; return path; } QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath)); QString targetFile = targetDir.absoluteFilePath(avatarFile.baseName()); if (!QFileInfo(targetFile).exists()) { QPixmap avatarPixmap; if (avatarPixmap.load(path)) { QPixmap squaredAvatarPixmap = cropToBiggestCenteredSquare(avatarPixmap); QPixmap maskedAvatar(squaredAvatarPixmap.size()); maskedAvatar.fill(QColor(0, 0, 0, 0)); QPainter maskPainter(&maskedAvatar); maskPainter.setBrush(Qt::black); maskPainter.drawRoundedRect(maskedAvatar.rect(), 25.0, 25.0, Qt::RelativeSize); maskPainter.setCompositionMode(QPainter::CompositionMode_SourceIn); maskPainter.drawPixmap(0, 0, squaredAvatarPixmap); maskPainter.end(); if (!maskedAvatar.scaled(size, size, Qt::KeepAspectRatio, Qt::SmoothTransformation).save(targetFile, "PNG")) { return path; } } else { SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path) << std::endl; } } return targetFile; } else { |