improve tooltips identifier and checkCanBeHovered

pull/6/head
Michail Vourlakos 6 years ago
parent 50ddf87d4d
commit 583b79314c

@ -116,7 +116,10 @@ Item {
||((index === layoutsContainer.endLayout.beginIndex+layoutsContainer.endLayout.count-1)&&(layoutsContainer.endLayout.count>1))) ||((index === layoutsContainer.endLayout.beginIndex+layoutsContainer.endLayout.count-1)&&(layoutsContainer.endLayout.count>1)))
readonly property bool acceptMouseEvents: applet && !isLattePlasmoid && !originalAppletBehavior && !appletItem.isSeparator && !communicator.parabolicEffectLocked readonly property bool acceptMouseEvents: applet && !isLattePlasmoid && !originalAppletBehavior && !appletItem.isSeparator && !communicator.parabolicEffectLocked
readonly property bool originalAppletBehavior: root.zoomFactor === 1 || (root.zoomFactor>1 && canBeHovered && lockZoom) readonly property bool originalAppletBehavior: root.zoomFactor === 1
|| (root.zoomFactor>1 && !canBeHovered)
|| (root.zoomFactor>1 && canBeHovered && lockZoom)
readonly property bool isSquare: communicator.overlayLatteIconIsActive readonly property bool isSquare: communicator.overlayLatteIconIsActive
property int animationTime: appliedDurationTime * (1.2 *units.shortDuration) property int animationTime: appliedDurationTime * (1.2 *units.shortDuration)
@ -321,12 +324,12 @@ Item {
var maxSize = root.iconSize + root.thickMargins; var maxSize = root.iconSize + root.thickMargins;
var maxForMinimumSize = root.iconSize + root.thickMargins; var maxForMinimumSize = root.iconSize + root.thickMargins;
if ( (((applet && root.isHorizontal && (applet.width > maxSize || applet.Layout.minimumWidth > maxForMinimumSize)) if ( isSystray
|| (applet && root.isVertical && (applet.height > maxSize || applet.Layout.minimumHeight > maxForMinimumSize))) || appletItem.needsFillSpace
&& !appletItem.isSpacer || (((applet && root.isHorizontal && (applet.width > maxSize || applet.Layout.minimumWidth > maxForMinimumSize))
&& !communicator.canShowOverlaiedLatteIcon) || (applet && root.isVertical && (applet.height > maxSize || applet.Layout.minimumHeight > maxForMinimumSize)))
|| isSystray && !appletItem.isSpacer
|| appletItem.needsFillSpace) { && !communicator.canShowOverlaiedLatteIcon) ) {
appletItem.canBeHovered = false; appletItem.canBeHovered = false;
} else { } else {
appletItem.canBeHovered = true; appletItem.canBeHovered = true;
@ -410,6 +413,10 @@ Item {
} }
onIsSystrayChanged: {
checkCanBeHovered();
}
onLatteAppletChanged: { onLatteAppletChanged: {
if(appletItem.latteApplet){ if(appletItem.latteApplet){
root.latteApplet = appletItem.latteApplet; root.latteApplet = appletItem.latteApplet;
@ -608,7 +615,7 @@ Item {
}*/ }*/
/* DEPRECATED in favor of VIEW::MouseSignalsTracking /* DEPRECATED in favor of VIEW::MouseSignalsTracking
MouseArea{ MouseArea{
id: appletMouseAreaBottom id: appletMouseAreaBottom
anchors.fill: parent anchors.fill: parent

Loading…
Cancel
Save