fix: Contain story does not work proper way with more square images #69…

… (#70)
pixijs · Jan 15, 2024 · d718ab2 · d718ab2
1 parent 8280732
commit d718ab2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/controllers/SizeController.ts b/src/controllers/SizeController.ts
@@ -596,19 +596,18 @@ export class SizeController
 
         if (minWidth || minHeight)
         {
-            let finalMinScaleToFit = finalScaleToFit;
-
-            if (layoutWidth * finalScaleToFit < minWidthVal)
+            if (minWidth && minHeight)
             {
-                finalMinScaleToFit = minFitScaleX;
+                finalScaleToFit = Math.max(minFitScaleX, minFitScaleY);
             }
-
-            if (layoutHeight * finalScaleToFit < minHeightVal)
+            else if (minWidth)
             {
-                finalMinScaleToFit = minFitScaleY;
+                finalScaleToFit = finalScaleX;
+            }
+            else if (minHeight)
+            {
+                finalScaleToFit = minFitScaleY;
             }
-
-            finalScaleToFit = Math.max(finalMinScaleToFit, finalMinScaleToFit);
         }
 
         this.layout.container.scale.set(finalScaleToFit);

diff --git a/src/stories/fit/Contain.stories.ts b/src/stories/fit/Contain.stories.ts
@@ -35,7 +35,9 @@ class LayoutStory
                 styles: {
                     position: 'center',
                     maxWidth: '100%',
-                    minHeight: '100%'
+                    maxHeight: '100%',
+                    minHeight: '100%',
+                    minWidth: '100%',
                 }
             },
             styles: {