diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-03-14 09:42:03 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-03-15 06:51:15 +0000 |
| commit | b1243b8c9ea0add1b7548428c8b0fcb8ee3ac71a (patch) | |
| tree | 7eb03c1f17628d96e44628cebe0dc0c2f42a13b1 /src/quick/util | |
| parent | 5b1538d1c0b408bb54786336f2e59c208686edb2 (diff) | |
Scale up SVG images if source size is larger than original size
Since SVG images can be scaled up without any loss of quality then we
should allow this to happen even though it is not done for other image
formats. This restores the 5.9.x behavior for SVG images.
Additionally the manual test is updated to showcase an embedded image
inside a SVG one to indicate this is continuing to work as before too.
Task-number: QTBUG-67019
Change-Id: Ia719899937f8146e8fab50aa85adf18e2f79aa98
Reviewed-by: Evangelos Foutras <evangelos@foutrelis.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 1a13f6395a..2bb2af4fc0 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -680,15 +680,18 @@ QSize QQuickImageProviderWithOptions::loadSize(const QSize &originalSize, const return res; const bool preserveAspectCropOrFit = options.preserveAspectRatioCrop() || options.preserveAspectRatioFit(); + const bool formatIsSvg = (format == "svg" || format == "svgz"); - if (!preserveAspectCropOrFit && (format == "svg" || format == "svgz") && !requestedSize.isEmpty()) + if (!preserveAspectCropOrFit && formatIsSvg && !requestedSize.isEmpty()) return requestedSize; qreal ratio = 0.0; - if (requestedSize.width() && (preserveAspectCropOrFit || requestedSize.width() < originalSize.width())) { + if (requestedSize.width() && (preserveAspectCropOrFit || formatIsSvg || + requestedSize.width() < originalSize.width())) { ratio = qreal(requestedSize.width()) / originalSize.width(); } - if (requestedSize.height() && (preserveAspectCropOrFit || requestedSize.height() < originalSize.height())) { + if (requestedSize.height() && (preserveAspectCropOrFit || formatIsSvg || + requestedSize.height() < originalSize.height())) { qreal hr = qreal(requestedSize.height()) / originalSize.height(); if (ratio == 0.0) ratio = hr; |