AutoFill applets must never exceed maxgivenspace

BUG:421786
5 years ago · 949b2a4c3b
parent fae249560e
commit 949b2a4c3b
1 changed files with 5 additions and 2 deletions
--- a/containment/package/contents/ui/applet/ItemWrapper.qml
+++ b/containment/package/contents/ui/applet/ItemWrapper.qml
@ -45,8 +45,11 @@ Item{
        }

        if (appletItem.isAutoFillApplet) {
-            return appletItem.layouter.maxMetricsInHigherPriority ?
-                        appletItem.maxAutoFillLength : Math.max(appletItem.minAutoFillLength, appletPreferredLength);
+            if (appletItem.layouter.maxMetricsInHigherPriority) {
+                return appletItem.maxAutoFillLength;
+            }
+
+            return Math.max(appletItem.minAutoFillLength,Math.min(appletPreferredLength,appletItem.maxAutoFillLength));
        }

        return root.inConfigureAppletsMode ? Math.max(Math.min(appletItem.metrics.iconSize, root.minAppletLengthInConfigure), scaledLength) : scaledLength;