From 35bc8f35605d54257c9058bc8f9ad86bd8aa6911 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 11 May 2020 18:45:53 +0300 Subject: [PATCH] fix ConfigOverlay behavior/appearance --- containment/package/contents/ui/VisibilityManager.qml | 2 +- containment/package/contents/ui/editmode/ConfigOverlay.qml | 2 +- containment/package/contents/ui/editmode/SettingsOverlay.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index 971b8d21e..9b737723b 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -108,7 +108,7 @@ Item{ //! is used to increase the mask thickness readonly property int marginBetweenContentsAndRuler: 10 property int extraNormalThickMask: Math.max(indicatorsExtraThickMask, shadowsExtraThickMask) - property int extraZoomThickMask: Math.max(marginBetweenContentsAndRuler, indicatorsExtraThickMask, shadowsExtraThickMask) + property int extraZoomThickMask: marginBetweenContentsAndRuler + Math.max(indicatorsExtraThickMask, shadowsExtraThickMask) //! this is set from indicators when they need extra thickness mask size readonly property int indicatorsExtraThickMask: indicators.info.extraMaskThickness property int shadowsExtraThickMask: { diff --git a/containment/package/contents/ui/editmode/ConfigOverlay.qml b/containment/package/contents/ui/editmode/ConfigOverlay.qml index 4320aaf2c..3dd8ecd8d 100644 --- a/containment/package/contents/ui/editmode/ConfigOverlay.qml +++ b/containment/package/contents/ui/editmode/ConfigOverlay.qml @@ -57,7 +57,7 @@ MouseArea { property int appletX property int appletY - readonly property int thickness: visibilityManager.thicknessNormalOriginalValue - visibilityManager.extraThickMask - 1 + readonly property int thickness: visibilityManager.thicknessNormalOriginalValue - visibilityManager.extraNormalThickMask - 1 readonly property int spacerHandleSize: units.smallSpacing onHeightChanged: tooltip.visible = false; diff --git a/containment/package/contents/ui/editmode/SettingsOverlay.qml b/containment/package/contents/ui/editmode/SettingsOverlay.qml index c516c22ca..11e2cb5d5 100644 --- a/containment/package/contents/ui/editmode/SettingsOverlay.qml +++ b/containment/package/contents/ui/editmode/SettingsOverlay.qml @@ -34,7 +34,7 @@ Item{ id: settingsRoot readonly property bool containsMouse: false /*headerSettings.containsMouse || ruler.containsMouse || tooltipMouseArea.containsMouse || editBackMouseArea.containsMouse*/ - readonly property int thickness: ruler.thickness + headerSettings.thickness + spacing * 3 + readonly property int thickness: ruler.thickness + headerSettings.thickness + spacing * 5 readonly property int spacing: 4 property int textShadow: {