[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=21df749

The following commit has been merged in the master branch:
commit 21df749be84950c271eb3d8f6bdb03d4834343c9
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 13:59:41 2014 +0200

    Properly set the size hints according to the Plasma 2 idioms
    
    Also compensates for the spacing, which was not done so far, for some
    reason.
---
 chat/org.kde.ktp-chat/contents/ui/FullChatList.qml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
index 7dce3f1..e17095f 100644
--- a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
@@ -19,6 +19,7 @@
 */
 
 import QtQuick 2.1
+import QtQuick.Layouts 1.1
 import org.kde.telepathy 0.1 as KTp
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -27,11 +28,17 @@ import org.kde.kquickcontrolsaddons 2.0 as ExtraComponents
 Grid {
     id: base
     property real minimumItemSize: 12
-    property real implicitItemSize: Math.max(0, Math.min(width, height))
-    property real implicitHeight: flow===Flow.TopToBottom ? itemsCount*implicitItemSize : itemsCount==0 ? 0 : implicitItemSize
-    property real implicitWidth: flow===Flow.LeftToRight ? itemsCount*implicitItemSize : itemsCount==0 ? 0 : implicitItemSize
-    property real minimumHeight: flow===Flow.TopToBottom ? itemsCount*minimumItemSize : itemsCount==0 ? 0 : minimumItemSize
-    property real minimumWidth: flow===Flow.LeftToRight ? itemsCount*minimumItemSize : itemsCount==0 ? 0 : minimumItemSize
+    property real preferredItemSize: Math.max(0, Math.min(width, height))
+    property real preferredLength: itemsCount*preferredItemSize+(spacing*itemsCount-1)
+    property real preferredThickness: itemsCount==0 ? 0 : preferredItemSize
+    property real minimumLength: itemsCount*minimumItemSize+(spacing*itemsCount-1)
+    property real minimumThickness: itemsCount==0 ? 0 : minimumItemSize
+
+    Layout.preferredHeight: flow===Flow.TopToBottom ? preferredLength : preferredThickness
+    Layout.preferredWidth: flow===Flow.LeftToRight ? preferredLength : preferredThickness
+    Layout.minimumHeight: flow===Flow.TopToBottom ? minimumLength : minimumThickness
+    Layout.minimumWidth: flow===Flow.LeftToRight ? minimumLength : minimumThickness
+
     property int currentIndex: -1
     property int itemsCount: pinnedView.count + conversationsView.count
     property real itemWidth: Math.max(0, flow===Flow.LeftToRight ? Math.min(height, width/itemsCount) : width)

-- 
ktp-contact-applet packaging