From 2727aa1616f30fde4c42dab0046e06c701d2e480 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 30 Apr 2020 16:48:25 +0300 Subject: [PATCH] add more metrics options for applets --- containment/package/contents/ui/abilities/Metrics.qml | 1 - .../abilities/definitions/metrics/Fraction.qml | 3 ++- .../abilities/definitions/metrics/Padding.qml | 1 + declarativeimports/abilities/definitions/metrics/Totals.qml | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/containment/package/contents/ui/abilities/Metrics.qml b/containment/package/contents/ui/abilities/Metrics.qml index 1394d272d..c4fda9f37 100644 --- a/containment/package/contents/ui/abilities/Metrics.qml +++ b/containment/package/contents/ui/abilities/Metrics.qml @@ -34,7 +34,6 @@ ContainerAbility.Metrics { iconSize: autosizeEnabled && autosize.iconSize > 0 ? Math.min(autosize.iconSize, maxIconSize) : maxIconSize maxIconSize: portionIconSize!==-1 ? portionIconSize : plasmoid.configuration.iconSize - //! Private Properties readonly property int portionIconSize: { //icon size based on screen height if ((plasmoid.configuration.proportionIconSize===-1) || !latteView) diff --git a/declarativeimports/abilities/definitions/metrics/Fraction.qml b/declarativeimports/abilities/definitions/metrics/Fraction.qml index bd2261eaa..432ff8166 100644 --- a/declarativeimports/abilities/definitions/metrics/Fraction.qml +++ b/declarativeimports/abilities/definitions/metrics/Fraction.qml @@ -22,5 +22,6 @@ import QtQuick 2.0 Item { property real thicknessMargin: 0.06 property real lengthMargin: 0.06 - property real lengthPadding: 8 + property real lengthPadding: 0.06 + property real lengthAppletPadding: 0.06 } diff --git a/declarativeimports/abilities/definitions/metrics/Padding.qml b/declarativeimports/abilities/definitions/metrics/Padding.qml index 114edf323..f9fd9c357 100644 --- a/declarativeimports/abilities/definitions/metrics/Padding.qml +++ b/declarativeimports/abilities/definitions/metrics/Padding.qml @@ -21,4 +21,5 @@ import QtQuick 2.0 Item { property int length: 4 + property int lengthApplet: 4 } diff --git a/declarativeimports/abilities/definitions/metrics/Totals.qml b/declarativeimports/abilities/definitions/metrics/Totals.qml index 34b0a6d5d..ad5d4a999 100644 --- a/declarativeimports/abilities/definitions/metrics/Totals.qml +++ b/declarativeimports/abilities/definitions/metrics/Totals.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 Item { - property int lengthSingleMargin: margin.length + padding.length - property int lengthBilateralMargins: 2 * lengthSingleMargin - property int thicknessBilateralMargins: 2 * margin.thickness + readonly property int lengthMargin: margin.length + padding.length + readonly property int lengthMargins: 2 * lengthMargin + readonly property int thicknessMargins: 2 * margin.thickness }