From 5d1bf4270953732a60d5985febf5b6de055234f6 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 1 Mar 2021 01:48:52 +0200 Subject: [PATCH] fix fillcalculations at Layouter.TwoSteps codepath --in Layouter two steps codepath at the end ALL fill applets at Start/End layouts should adjust their size in order to not overlap with fill applets in Main layout. These calculations were broken because they were not applied properly. --- .../contents/ui/abilities/privates/LayouterPrivate.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml b/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml index 46c8cf10f..395321c26 100644 --- a/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml +++ b/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml @@ -348,7 +348,8 @@ Item { if (startLayout.fillApplets > 0) { if (mainLayout.fillApplets > 0) { - //! adjust final fill applet size in mainlayouts final length + //! finally adjust ALL startLayout fill applets size in mainlayouts final length + noStart = startLayout.fillApplets; sizePerAppletStart = ((max_length/2) - (mainLayout.grid.length/2) - startLayout.sizeWithNoFillApplets) / noStart; } @@ -357,13 +358,13 @@ Item { if (endLayout.fillApplets > 0) { if (mainLayout.fillApplets > 0) { - //! adjust final fill applet size in mainlayouts final length + //! finally adjust ALL endLayout fill applets size in mainlayouts final length + noEnd = endLayout.fillApplets; sizePerAppletEnd = ((max_length/2) - (mainLayout.grid.length/2) - endLayout.sizeWithNoFillApplets) / noEnd; } computeStep2ForLayout(endLayout.grid, sizePerAppletEnd, noEnd, inMaxAutoFillCalculations); } - } function updateFillAppletsWithOneStep(inMaxAutoFillCalculations) {