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

The following commit has been merged in the master branch:
commit ee48913d565524d37a32926554a0d3455d0d6574
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Mar 26 21:02:48 2013 +0100

    Simplify the behavior of the main UI file in the chat plasmoid
    
    Provide a bigger minimum size, I thought it would never get to the
    minimum but it does sometimes, so we can better give a bigger minimum
    (which is still too small for a proper usage).
    Rename preferredWidth/Height -> implicit*. It seems like it's the
    proper way to call these.
    When the plasmoid is empty, offer an empty preferred (uh implicit) size.
    
    REVIEW: 109699
---
 chat/org.kde.ktp-chat/contents/ui/main.qml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 1ee042a..1f1c2bf 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -26,10 +26,10 @@ import org.kde.qtextracomponents 0.1 as ExtraComponents
 
 Grid {
     id: base
-    property real minimumItemSize: 4
-    property real preferredItemSize: Math.max(0, Math.min(width, height))
-    property real preferredHeight: flow===Flow.TopToBottom ? itemsCount*preferredItemSize : preferredItemSize
-    property real preferredWidth: flow===Flow.LeftToRight ? itemsCount*preferredItemSize : preferredItemSize
+    property real minimumItemSize: 12
+    property real implicitItemSize: Math.max(0, Math.min(width, height))
+    property real implicitHeight: flow===Flow.TopToBottom ? itemsCount*preferredItemSize : itemsCount==0 ? 0 : preferredItemSize
+    property real implicitWidth: flow===Flow.LeftToRight ? itemsCount*preferredItemSize : itemsCount==0 ? 0 : preferredItemSize
     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 int currentIndex: -1

-- 
ktp-contact-applet packaging