From 9f5ab1397d4892314a68907c21a8c9b56215129e Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Thu, 27 Jul 2017 23:39:15 +0300
Subject: [PATCH] support combining window previews and titletips

---
 plasmoid/package/contents/ui/main.qml                 | 2 +-
 plasmoid/package/contents/ui/task/TaskDelegate.qml    | 4 ++--
 shell/package/contents/configuration/TasksConfig.qml  | 2 --
 shell/package/contents/configuration/TweaksConfig.qml | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 9e54c78b5..50b65ccce 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -141,7 +141,7 @@ Item {
     property bool showOnlyCurrentScreen: latteDock ? latteDock.showOnlyCurrentScreen : plasmoid.configuration.showOnlyCurrentScreen
     property bool showOnlyCurrentDesktop: latteDock ? latteDock.showOnlyCurrentDesktop : plasmoid.configuration.showOnlyCurrentDesktop
     property bool showOnlyCurrentActivity: latteDock ? latteDock.showOnlyCurrentActivity : plasmoid.configuration.showOnlyCurrentActivity
-    property bool showPreviews:  latteDock ? (latteDock.showToolTips && !titleTooltips) : plasmoid.configuration.showToolTips
+    property bool showPreviews:  latteDock ? latteDock.showToolTips : plasmoid.configuration.showToolTips
     property bool showWindowActions: latteDock ? latteDock.showWindowActions : plasmoid.configuration.showWindowActions
     property bool smartLaunchersEnabled: latteDock ? latteDock.smartLaunchersEnabled : plasmoid.configuration.smartLaunchersEnabled
     property bool threeColorsWindows: latteDock ? latteDock.threeColorsWindows : plasmoid.configuration.threeColorsWindows
diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml
index 5704c90f6..7d5cc2ff6 100644
--- a/plasmoid/package/contents/ui/task/TaskDelegate.qml
+++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml
@@ -538,7 +538,7 @@ MouseArea{
             return;
         }
 
-        if (root.latteDock){
+        if (root.latteDock && (!root.showPreviews || (root.showPreviews && isLauncher))){
             root.latteDock.showTooltipLabel(mainItemContainer, model.AppName);
         }
 
@@ -567,7 +567,7 @@ MouseArea{
     onExited: {
         mouseEntered = false;
 
-        if (root.latteDock){
+        if (root.latteDock && (!root.showPreviews || (root.showPreviews && isLauncher))){
             root.latteDock.hideTooltipLabel();
         }
 
diff --git a/shell/package/contents/configuration/TasksConfig.qml b/shell/package/contents/configuration/TasksConfig.qml
index e9e8a3d6c..03b2c0946 100644
--- a/shell/package/contents/configuration/TasksConfig.qml
+++ b/shell/package/contents/configuration/TasksConfig.qml
@@ -112,8 +112,6 @@ PlasmaComponents.Page {
                 Layout.leftMargin: units.smallSpacing * 2
                 text: i18n("Preview windows on hovering")
                 checked: plasmoid.configuration.showToolTips
-                tooltip: i18n("This option can be combined with applet/task title tooltips")
-                enabled: !plasmoid.configuration.titleTooltips
 
                 onClicked: {
                     plasmoid.configuration.showToolTips = checked;
diff --git a/shell/package/contents/configuration/TweaksConfig.qml b/shell/package/contents/configuration/TweaksConfig.qml
index 7f2e94ff9..db1b35906 100644
--- a/shell/package/contents/configuration/TweaksConfig.qml
+++ b/shell/package/contents/configuration/TweaksConfig.qml
@@ -66,7 +66,6 @@ PlasmaComponents.Page {
                 Layout.leftMargin: units.smallSpacing * 2
                 text: i18n("Show applets/task title tooltips on hovering")
                 checked: plasmoid.configuration.titleTooltips
-                tooltip: i18n("This option can be combined with tasks window previews")
 
                 onClicked: {
                     plasmoid.configuration.titleTooltips = checked;