move applet active indicator out of colorizer

--the Active Applet Indicator must not be colorized
and as such is moved out of the Colorozing scope
pull/4/head
Michail Vourlakos 6 years ago
parent 6c09418aa8
commit 9d49063cc4

@ -480,7 +480,6 @@ Item {
id: appletFlow
width: container.computeWidth
height: container.computeHeight
opacity: appletColorizer.mustBeShown ? 0 : 1
anchors.rightMargin: (latteApplet || (showZoomed && root.editMode)) ||
(plasmoid.location !== PlasmaCore.Types.RightEdge) ? 0 : shownAppletMargin
@ -491,22 +490,50 @@ Item {
anchors.bottomMargin: (latteApplet || (showZoomed && root.editMode)) ||
(plasmoid.location !== PlasmaCore.Types.BottomEdge) ? 0 : shownAppletMargin
Behavior on opacity {
NumberAnimation {
duration: 0.8 * root.animationTime
easing.type: Easing.OutCubic
}
}
// a hidden spacer for the first element to add stability
// IMPORTANT: hidden spacers must be tested on vertical !!!
AppletHiddenSpacer{id: hiddenSpacerLeft}
AppletItemWrapper{
id: wrapper
Item {
width: wrapper.width
height: wrapper.height
AppletItemWrapper{
id: wrapper
TitleTooltipParent{
id: titleTooltipParent
}
}
//! Active Indicator loader
Loader{
anchors.fill: parent
active: root.activeIndicator === Latte.Types.AllIndicator
|| (root.activeIndicator === Latte.Types.InternalsIndicator && communicator.overlayLatteIconIsActive)
sourceComponent: Item{
anchors.fill: parent
ActiveIndicator{}
}
}
//! The Applet Colorizer
Colorizer.Applet {
id: appletColorizer
anchors.fill: parent
opacity: mustBeShown ? 1 : 0
readonly property bool mustBeShown: colorizerManager.mustBeShown
&& !container.userBlocksColorizing
&& !container.appletBlocksColorizing
TitleTooltipParent{
id: titleTooltipParent
Behavior on opacity {
NumberAnimation {
duration: 1.2 * root.animationTime
easing.type: Easing.OutCubic
}
}
}
}
@ -563,24 +590,6 @@ Item {
}
}
//! The Applet Colorizer
Colorizer.Applet {
id: appletColorizer
anchors.fill: parent
opacity: mustBeShown ? 1 : 0
readonly property bool mustBeShown: colorizerManager.mustBeShown
&& !container.userBlocksColorizing
&& !container.appletBlocksColorizing
Behavior on opacity {
NumberAnimation {
duration: 1.2 * root.animationTime
easing.type: Easing.OutCubic
}
}
}
MouseArea{
id: appletMouseArea

@ -113,6 +113,8 @@ Item{
}
}
opacity: appletColorizer.mustBeShown ? 0 : 1
//width: container.isInternalViewSplitter && !root.editMode ? 0 : Math.round( latteApplet ? ((container.showZoomed && root.isVertical) ?
// scaledWidth : latteApplet.tasksWidth) : scaledWidth )
//height: container.isInternalViewSplitter&& !root.editMode ? 0 : Math.round( latteApplet ? ((container.showZoomed && root.isHorizontal) ?
@ -167,6 +169,13 @@ Item{
property Item clickedEffect: _clickedEffect
property Item containerForOverlayIcon: _containerForOverlayIcon
Behavior on opacity {
NumberAnimation {
duration: 0.8 * root.animationTime
easing.type: Easing.OutCubic
}
}
// property int pHeight: applet ? applet.Layout.preferredHeight : -10
/*function debugLayouts(){
@ -370,17 +379,6 @@ Item{
}
}
Loader{
anchors.fill: parent
active: root.activeIndicator === Latte.Types.AllIndicator
|| (root.activeIndicator === Latte.Types.InternalsIndicator && communicator.overlayLatteIconIsActive)
sourceComponent: Item{
anchors.fill: parent
ActiveIndicator{}
}
}
Item{
id:_wrapperContainer

@ -28,7 +28,7 @@ Item {
id: colorizer
anchors.fill: parent
color: colorizerManager.applyColor
source: appletFlow
source: wrapper
}
///Shadow in applets

Loading…
Cancel
Save