From 62879df90eca70fd0b49f9cb6c4b3c89c9b2becc Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 6 May 2020 18:38:48 +0300 Subject: [PATCH] rename appletitem aliases properly --- containment/package/contents/ui/applet/AppletItem.qml | 8 ++++---- .../package/contents/ui/applet/HiddenSpacer.qml | 2 +- .../package/contents/ui/applet/indicator/Bridge.qml | 10 +++++----- .../package/contents/ui/applet/indicator/Loader.qml | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index 844f15e9d..e14255dbe 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -219,8 +219,8 @@ Item { property Item tooltipVisualParent: titleTooltipParent - property Item communicatorAlias: communicator - property Item wrapperAlias: wrapper + readonly property alias communicator: _communicator + readonly property alias wrapper: _wrapper property Item animations: null property Item appletsRecords: null @@ -636,7 +636,7 @@ Item { //! It is used for any communication needed with the underlying applet Communicator.Engine{ - id: communicator + id: _communicator //set up the overlayed appletItems and properties for when a overlaiedIconItem must be presented to the user //because the plasma widgets specific implementation breaks the Latte experience @@ -732,7 +732,7 @@ Item { } ItemWrapper{ - id: wrapper + id: _wrapper TitleTooltipParent{ id: titleTooltipParent diff --git a/containment/package/contents/ui/applet/HiddenSpacer.qml b/containment/package/contents/ui/applet/HiddenSpacer.qml index 31409b192..acc8f21f7 100644 --- a/containment/package/contents/ui/applet/HiddenSpacer.qml +++ b/containment/package/contents/ui/applet/HiddenSpacer.qml @@ -50,7 +50,7 @@ Item{ readonly property bool atEdgeForcingFittsLaw: !isSeparator && !parabolicEffectMarginsEnabled && atScreenEdge readonly property int subtrackedMargins: { if (atEdgeForcingFittsLaw && ((firstAppletInContainer && rightSpacer) || (lastAppletInContainer && !rightSpacer ))) { - return (wrapperAlias.edgeLengthMarginsDisabled ? appletItem.metrics.margin.length + appletItem.lengthAppletPadding : appletItem.metrics.margin.length); + return (wrapper.edgeLengthMarginsDisabled ? appletItem.metrics.margin.length + appletItem.lengthAppletPadding : appletItem.metrics.margin.length); } return 0; diff --git a/containment/package/contents/ui/applet/indicator/Bridge.qml b/containment/package/contents/ui/applet/indicator/Bridge.qml index d15dd3d02..f250efb89 100644 --- a/containment/package/contents/ui/applet/indicator/Bridge.qml +++ b/containment/package/contents/ui/applet/indicator/Bridge.qml @@ -27,9 +27,9 @@ Item{ readonly property bool active: appletIsValid && ((indicators.isEnabled - && appletItem.communicatorAlias.requires.activeIndicatorEnabled + && appletItem.communicator.requires.activeIndicatorEnabled && indicators.info.enabledForApplets) - || (!indicators.info.enabledForApplets && appletItem.communicatorAlias.overlayLatteIconIsActive)) + || (!indicators.info.enabledForApplets && appletItem.communicator.overlayLatteIconIsActive)) /* Indicators Properties in order use them*/ readonly property bool isTask: false @@ -58,7 +58,7 @@ Item{ readonly property int currentIconSize: appletIsValid ? appletItem.metrics.iconSize : metrics.iconSize readonly property int maxIconSize: appletIsValid ? appletItem.metrics.maxIconSize : metrics.maxIconSize - readonly property real scaleFactor: appletIsValid ? appletItem.wrapperAlias.zoomScale : 1 + readonly property real scaleFactor: appletIsValid ? appletItem.wrapper.zoomScale : 1 readonly property real panelOpacity: root.currentPanelOpacity readonly property color shadowColor: root.appShadowColorSolid @@ -75,7 +75,7 @@ Item{ //!icon colors property color iconBackgroundColor: { if (appletIsValid) { - return isSquare ? appletItem.wrapperAlias.overlayIconLoader.backgroundColor : colorizerManager.buttonFocusColor; + return isSquare ? appletItem.wrapper.overlayIconLoader.backgroundColor : colorizerManager.buttonFocusColor; } return "black"; @@ -83,7 +83,7 @@ Item{ property color iconGlowColor:{ if (appletIsValid) { - return isSquare ? appletItem.wrapperAlias.overlayIconLoader.glowColor : colorizerManager.focusGlowColor; + return isSquare ? appletItem.wrapper.overlayIconLoader.glowColor : colorizerManager.focusGlowColor; } return "white"; diff --git a/containment/package/contents/ui/applet/indicator/Loader.qml b/containment/package/contents/ui/applet/indicator/Loader.qml index 0a268ff05..878b30a81 100644 --- a/containment/package/contents/ui/applet/indicator/Loader.qml +++ b/containment/package/contents/ui/applet/indicator/Loader.qml @@ -33,7 +33,7 @@ Loader { active: level.bridge && level.bridge.active && (level.isBackground || (level.isForeground && indicators.info.providesFrontLayer)) sourceComponent: { - if (!indicators.info.enabledForApplets && appletItem.communicatorAlias.overlayLatteIconIsActive) { + if (!indicators.info.enabledForApplets && appletItem.communicator.overlayLatteIconIsActive) { return indicators.plasmaStyleComponent; } @@ -43,24 +43,24 @@ Loader { width: { if (root.isHorizontal) { if (canBeHovered) { - return appletItem.wrapperAlias.zoomScale * visualLockedWidth; + return appletItem.wrapper.zoomScale * visualLockedWidth; } return appletWrapper.width + appletItem.internalWidthMargins; } else { - return appletItem.wrapperAlias.width; + return appletItem.wrapper.width; } } height: { if (root.isVertical) { if (canBeHovered) { - return appletItem.wrapperAlias.zoomScale * visualLockedHeight; + return appletItem.wrapper.zoomScale * visualLockedHeight; } return appletWrapper.height + appletItem.internalHeightMargins; } else { - return appletItem.wrapperAlias.height; + return appletItem.wrapper.height; } }