1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AppleIconEngine: fix aspect ratio adjustment

Browse Source 
The requested icon might not be square, so fit the image
we have correctly into the requested size.

Fixes: QTBUG-121764
Change-Id: I877dedf5aa779cd82a75a1a49b26c08e3cea6163
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 5b993fa8ede67871a8b2434505bc3c3d8bb906c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-02-14 14:45:20 +01:00 committed by Qt Cherry-pick Bot
parent 04ecd7d090
commit 72cc294156
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/platform/darwin/qappleiconengine.mm
View File

@ -185,18 +185,19 @@ QPixmap QAppleIconEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, QIco
}
const auto *image = configuredImage(m_image, color);
// the size we want is typically square, but the icon might not be. So
// ask for a pixmap with the same aspect ratio as the icon, and then
// center that within a pixmap of the requested size.
// The size we want might have a different aspect ratio than the icon we have.
// So ask for a pixmap with the same aspect ratio as the icon, constrained to the
// size we want, and then center that within a pixmap of the requested size.
QSizeF renderSize = size * scale;
const bool aspectRatioAdjusted = image.size.width != image.size.height;
const double inputAspectRatio = image.size.width / image.size.height;
const double outputAspectRatio = size.width() / size.height();
const bool aspectRatioAdjusted = !qFuzzyCompare(inputAspectRatio, outputAspectRatio);
if (aspectRatioAdjusted) {
double aspectRatio = image.size.width / image.size.height;
// don't grow
if (aspectRatio < 1)
renderSize.rwidth() = renderSize.height() * aspectRatio;
if (outputAspectRatio > inputAspectRatio)
renderSize.rwidth() = renderSize.height() * inputAspectRatio;
else
renderSize.rheight() = renderSize.width() / aspectRatio;
renderSize.rheight() = renderSize.width() / inputAspectRatio;
}
QPixmap iconPixmap = imageToPixmap(image, renderSize);