rename appletitem aliases properly

pull/15/head
Michail Vourlakos 5 years ago
parent b1ce98e8a4
commit 62879df90e

@ -219,8 +219,8 @@ Item {
property Item tooltipVisualParent: titleTooltipParent property Item tooltipVisualParent: titleTooltipParent
property Item communicatorAlias: communicator readonly property alias communicator: _communicator
property Item wrapperAlias: wrapper readonly property alias wrapper: _wrapper
property Item animations: null property Item animations: null
property Item appletsRecords: null property Item appletsRecords: null
@ -636,7 +636,7 @@ Item {
//! It is used for any communication needed with the underlying applet //! It is used for any communication needed with the underlying applet
Communicator.Engine{ Communicator.Engine{
id: communicator id: _communicator
//set up the overlayed appletItems and properties for when a overlaiedIconItem must be presented to the user //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 //because the plasma widgets specific implementation breaks the Latte experience
@ -732,7 +732,7 @@ Item {
} }
ItemWrapper{ ItemWrapper{
id: wrapper id: _wrapper
TitleTooltipParent{ TitleTooltipParent{
id: titleTooltipParent id: titleTooltipParent

@ -50,7 +50,7 @@ Item{
readonly property bool atEdgeForcingFittsLaw: !isSeparator && !parabolicEffectMarginsEnabled && atScreenEdge readonly property bool atEdgeForcingFittsLaw: !isSeparator && !parabolicEffectMarginsEnabled && atScreenEdge
readonly property int subtrackedMargins: { readonly property int subtrackedMargins: {
if (atEdgeForcingFittsLaw && ((firstAppletInContainer && rightSpacer) || (lastAppletInContainer && !rightSpacer ))) { 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; return 0;

@ -27,9 +27,9 @@ Item{
readonly property bool active: appletIsValid && readonly property bool active: appletIsValid &&
((indicators.isEnabled ((indicators.isEnabled
&& appletItem.communicatorAlias.requires.activeIndicatorEnabled && appletItem.communicator.requires.activeIndicatorEnabled
&& indicators.info.enabledForApplets) && indicators.info.enabledForApplets)
|| (!indicators.info.enabledForApplets && appletItem.communicatorAlias.overlayLatteIconIsActive)) || (!indicators.info.enabledForApplets && appletItem.communicator.overlayLatteIconIsActive))
/* Indicators Properties in order use them*/ /* Indicators Properties in order use them*/
readonly property bool isTask: false readonly property bool isTask: false
@ -58,7 +58,7 @@ Item{
readonly property int currentIconSize: appletIsValid ? appletItem.metrics.iconSize : metrics.iconSize readonly property int currentIconSize: appletIsValid ? appletItem.metrics.iconSize : metrics.iconSize
readonly property int maxIconSize: appletIsValid ? appletItem.metrics.maxIconSize : metrics.maxIconSize 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 real panelOpacity: root.currentPanelOpacity
readonly property color shadowColor: root.appShadowColorSolid readonly property color shadowColor: root.appShadowColorSolid
@ -75,7 +75,7 @@ Item{
//!icon colors //!icon colors
property color iconBackgroundColor: { property color iconBackgroundColor: {
if (appletIsValid) { if (appletIsValid) {
return isSquare ? appletItem.wrapperAlias.overlayIconLoader.backgroundColor : colorizerManager.buttonFocusColor; return isSquare ? appletItem.wrapper.overlayIconLoader.backgroundColor : colorizerManager.buttonFocusColor;
} }
return "black"; return "black";
@ -83,7 +83,7 @@ Item{
property color iconGlowColor:{ property color iconGlowColor:{
if (appletIsValid) { if (appletIsValid) {
return isSquare ? appletItem.wrapperAlias.overlayIconLoader.glowColor : colorizerManager.focusGlowColor; return isSquare ? appletItem.wrapper.overlayIconLoader.glowColor : colorizerManager.focusGlowColor;
} }
return "white"; return "white";

@ -33,7 +33,7 @@ Loader {
active: level.bridge && level.bridge.active && (level.isBackground || (level.isForeground && indicators.info.providesFrontLayer)) active: level.bridge && level.bridge.active && (level.isBackground || (level.isForeground && indicators.info.providesFrontLayer))
sourceComponent: { sourceComponent: {
if (!indicators.info.enabledForApplets && appletItem.communicatorAlias.overlayLatteIconIsActive) { if (!indicators.info.enabledForApplets && appletItem.communicator.overlayLatteIconIsActive) {
return indicators.plasmaStyleComponent; return indicators.plasmaStyleComponent;
} }
@ -43,24 +43,24 @@ Loader {
width: { width: {
if (root.isHorizontal) { if (root.isHorizontal) {
if (canBeHovered) { if (canBeHovered) {
return appletItem.wrapperAlias.zoomScale * visualLockedWidth; return appletItem.wrapper.zoomScale * visualLockedWidth;
} }
return appletWrapper.width + appletItem.internalWidthMargins; return appletWrapper.width + appletItem.internalWidthMargins;
} else { } else {
return appletItem.wrapperAlias.width; return appletItem.wrapper.width;
} }
} }
height: { height: {
if (root.isVertical) { if (root.isVertical) {
if (canBeHovered) { if (canBeHovered) {
return appletItem.wrapperAlias.zoomScale * visualLockedHeight; return appletItem.wrapper.zoomScale * visualLockedHeight;
} }
return appletWrapper.height + appletItem.internalHeightMargins; return appletWrapper.height + appletItem.internalHeightMargins;
} else { } else {
return appletItem.wrapperAlias.height; return appletItem.wrapper.height;
} }
} }

Loading…
Cancel
Save