[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=11b8f5e

The following commit has been merged in the master branch:
commit 11b8f5e009b834c3b94a9416482a0a8f774c7043
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 13 15:17:18 2012 +1100

    Change Alignment of text in chat area to make messages easier to see
    
    Header now has Text.AlignBottom and body now has Text.AlignTop. This
    essentially 'groups' them together.
---
 chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
index 031ca26..e6871e4 100644
--- a/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
@@ -8,12 +8,13 @@ Item {
     PlasmaComponents.Label {
         id: header
 
-        height: paintedHeight
         width: view.width
         wrapMode: Text.Wrap
 
         color: textColor
         text: "<b>[" + Qt.formatTime(model.time) + "] " + model.user + " :</b>"
+
+        verticalAlignment: Text.AlignBottom
     }
     PlasmaComponents.Label {
         id: body
@@ -25,6 +26,7 @@ Item {
         color: textColor
         text: model.text
         textFormat: Text.RichText
+        verticalAlignment: Text.AlignTop
     }
 
     height: header.height + body.height

-- 
ktp-contact-applet packaging