Fix viewBox clipping

sammycage · Jan 19, 2025 · 651bef6 · 651bef6
1 parent e82b745
commit 651bef6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/source/svgproperty.cpp b/source/svgproperty.cpp
@@ -510,9 +510,13 @@ bool SVGPreserveAspectRatio::parse(std::string_view input)
 Rect SVGPreserveAspectRatio::getClipRect(const Rect& viewBoxRect, const Size& viewportSize) const
 {
     assert(!viewBoxRect.isEmpty() && !viewportSize.isEmpty());
-    if(m_meetOrSlice == MeetOrSlice::Meet)
-        return viewBoxRect;
-    auto scale = std::max(viewportSize.w / viewBoxRect.w, viewportSize.h / viewBoxRect.h);
+    auto xScale = viewportSize.w / viewBoxRect.w;
+    auto yScale = viewportSize.h / viewBoxRect.h;
+    if(m_alignType == AlignType::None) {
+        return Rect(viewBoxRect.x, viewBoxRect.y, viewportSize.w / xScale, viewportSize.h / yScale);
+    }
+
+    auto scale = (m_meetOrSlice == MeetOrSlice::Meet) ? std::min(xScale, yScale) : std::max(xScale, yScale);
     auto xOffset = -viewBoxRect.x * scale;
     auto yOffset = -viewBoxRect.y * scale;
     auto viewWidth = viewBoxRect.w * scale;