From 297b3a7d5b4a902bdc14f83f0282b85908070b9d Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 6 Feb 2021 13:13:07 +0200 Subject: [PATCH] Revert "fixes for applets thin tooltips" This reverts commit 4fc85ba8c59a893729bb5408b1141d4cc27f64bc. --- containment/package/contents/ui/applet/AppletItem.qml | 2 +- containment/package/contents/ui/applet/ParabolicArea.qml | 8 +++----- .../contents/configuration/pages/BehaviorConfig.qml | 7 ++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index a5efa75b0..934f1dd30 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -874,7 +874,7 @@ Item { active: isParabolicEnabled || isThinTooltipEnabled readonly property bool isParabolicEnabled: appletItem.parabolic.isEnabled && !(lockZoom || isHidden) - readonly property bool isThinTooltipEnabled: appletItem.thinTooltip.isEnabled && !isHidden + readonly property bool isThinTooltipEnabled: appletItem.thinTooltip.isEnabled && !isHidden sourceComponent: ParabolicArea{} diff --git a/containment/package/contents/ui/applet/ParabolicArea.qml b/containment/package/contents/ui/applet/ParabolicArea.qml index c65d5b292..c22cf5105 100644 --- a/containment/package/contents/ui/applet/ParabolicArea.qml +++ b/containment/package/contents/ui/applet/ParabolicArea.qml @@ -40,15 +40,13 @@ Item { anchors.fill: parent enabled: visible hoverEnabled: true - visible: appletItem.parabolic.currentParabolicItem !== _parabolicArea + visible: appletItem.parabolicEffectIsSupported + && !communicator.indexerIsSupported + && appletItem.parabolic.currentParabolicItem !== _parabolicArea onEntered: { appletItem.parabolic.setCurrentParabolicItem(_parabolicArea); - if (isThinTooltipEnabled && !(isSeparator || isSpacer)) { - appletItem.thinTooltip.show(appletItem.tooltipVisualParent, applet.title); - } - if (isParabolicEnabled) { var vIndex = appletItem.indexer.visibleIndex(index); appletItem.parabolic.setCurrentParabolicItemIndex(vIndex); diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml index 65f148a30..67e0865b4 100644 --- a/shell/package/contents/configuration/pages/BehaviorConfig.qml +++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml @@ -797,9 +797,10 @@ PlasmaComponents.Page { text: i18n("Thin title tooltips on hovering") tooltip: i18n("Show narrow tooltips produced by Latte for items.\nThese tooltips are not drawn when applets zoom effect is disabled"); checked: plasmoid.configuration.titleTooltips + enabled: latteView.type === LatteCore.Types.DockView onClicked: { - plasmoid.configuration.titleTooltips = checked; + plasmoid.configuration.titleTooltips = !plasmoid.configuration.titleTooltips; } } @@ -812,7 +813,7 @@ PlasmaComponents.Page { visible: dialog.advancedLevel onClicked: { - plasmoid.configuration.mouseWheelActions = checked; + plasmoid.configuration.mouseWheelActions = !plasmoid.configuration.mouseWheelActions; } } @@ -826,7 +827,7 @@ PlasmaComponents.Page { enabled: latteView.type === LatteCore.Types.DockView onClicked: { - plasmoid.configuration.autoSizeEnabled = checked; + plasmoid.configuration.autoSizeEnabled = !plasmoid.configuration.autoSizeEnabled } }