[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=b8adb5c

The following commit has been merged in the master branch:
commit b8adb5c50eca33fb72bf147775689a4036f31706
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Feb 19 03:01:11 2013 +0100

    First attempt to make popup placement a bit smarter
    
    If it's a horizontal layout, put the dialog below, if it's a vertical,
    put it at the right.
    This is obviously not the best yet, but it's better than the current state.
    
    REVIEW: 109030
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 3 ++-
 chat/org.kde.ktp-chat/contents/ui/main.qml                 | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 74cbb36..e17e925 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -25,6 +25,7 @@ import org.kde.telepathy 0.1
 ConversationDelegateButton {
     id: convButton
     property alias isCurrentConversation: dialog.visible
+    property bool popupBelow: true
     
     avatar: model.conversation.target.avatar
     nick: model.conversation.target.nick
@@ -65,7 +66,7 @@ ConversationDelegateButton {
         onVisibleChanged: {
             if(visible) {
                 windowHide.hideWindowFromTaskbar(dialog.windowId)
-                var point = dialog.popupPosition(convButton, Qt.AlignBottom);
+                var point = dialog.popupPosition(convButton, convButton.popupBelow ? Qt.AlignBottom : Qt.AlignRight);
                 console.log("Showing dialog at (" + point.x + "," + point.y + ")");
 
                 dialog.x = point.x;
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 764786c..19d7a5c 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -84,6 +84,7 @@ Grid {
         delegate: ConversationDelegate {
             width: base.itemSize
             height: width
+            popupBelow: base.flow === Flow.LeftToRight
         }
         model: handler.conversations
     }

-- 
ktp-contact-applet packaging