upgrade extraFromIndicators to abilities

containment/package/contents/ui/VisibilityManager.qml

@@ -92,11 +92,8 @@ Item{
 
     //! is used to increase the mask thickness
     readonly property int marginBetweenContentsAndRuler: 10
-    property int extraNormalThickMask: Math.max(indicatorsExtraThickMask, metrics.mask.thickness.extraFromShadows)
-    property int extraZoomThickMask: marginBetweenContentsAndRuler + Math.max(indicatorsExtraThickMask, metrics.mask.thickness.extraFromShadows)
-    //! this is set from indicators when they need extra thickness mask size
-    readonly property int indicatorsExtraThickMask: indicators.info.extraMaskThickness
-
+    property int extraNormalThickMask: Math.max(metrics.mask.thickness.extraFromIndicators, metrics.mask.thickness.extraFromShadows)
+    property int extraZoomThickMask: marginBetweenContentsAndRuler + Math.max(metrics.mask.thickness.extraFromIndicators, metrics.mask.thickness.extraFromShadows)
 
     property Item applets: null
 

containment/package/contents/ui/abilities/privates/MetricsPrivate.qml

@@ -119,6 +119,8 @@ ContainerAbility.Metrics {
 
                 return 0;
             }
+
+            readonly property int extraFromIndicators: indicators.info.extraMaskThickness
         }
     }