[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=f076a7e

The following commit has been merged in the master branch:
commit f076a7ea92d8990fb4fc852a308f6245663aa9e8
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Oct 31 17:47:29 2014 +0100

    Re-implement the tooltip on the plasmoid again
    
    Ensure it only shows if the conversation is disabled. For now it shows the
    name and the presence icon.
---
 .../contents/ui/ConversationDelegateButton.qml     | 27 +++++++++-------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index 60fcd81..5fff303 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -27,17 +27,15 @@ import org.kde.telepathy 0.1
 MouseArea
 {
     id: mouseArea
-    hoverEnabled: true
 
     property variant account
     property variant contact
     property alias avatar: icon.source
-    property string title
-    property string presenceIconName
+    property alias title: toolTip.mainText
+    property alias presenceIconName: toolTip.icon
     property alias overlay: overlayLoader.sourceComponent
     property bool needsAttention: false
-//     checked: base.currentIndex==index
-//     checkable: checked
+    property bool focused: base.currentIndex==index
 
     PlasmaCore.FrameSvgItem {
         id: frame
@@ -45,8 +43,8 @@ MouseArea
         anchors.fill: parent
 
         imagePath: "widgets/tasks"
-        prefix: taskPrefix(base.currentIndex==index ? "focus" :
-                           mouseArea.containsMouse  ? "hover" :
+        prefix: taskPrefix(mouseArea.focused        ? "focus" :
+                           toolTip.containsMouse    ? "hover" :
                            mouseArea.needsAttention ? "attention"
                                                     : "normal")
 
@@ -81,15 +79,12 @@ MouseArea
         }
     }
 
-//     //The MouseArea is just a workaround because otherwise the ToolTip steals the mouse hover events
-//     //and the button doesn't get painted properly
-//     MouseArea {
-//         PlasmaCore.ToolTip {
-//             id: tooltip
-//             target: parent
-//         }
-//         acceptedButtons: null
-//     }
+    PlasmaCore.ToolTipArea {
+        id: toolTip
+
+        active: !mouseArea.focused
+        anchors.fill: parent
+    }
     
     DropArea {
         id: dropArea

-- 
ktp-contact-applet packaging