Merge lp:~zsombi/ubuntu-ui-toolkit/65-last-divider-invisible into lp:~zsombi/ubuntu-ui-toolkit/listitem-master

[Zsombor Egri]

Last item's divider in a ListView or when parent has count property is not visible.

[lp:~zsombi/ubuntu-ui-toolkit/65-last-divider-invisible]

1264. By Zsombor Egri on 2014-09-19

prereq sync

1265. By Zsombor Egri on 2014-09-24

prereq sync

1266. By Zsombor Egri on 2014-09-25

prereq sync

1267. By Zsombor Egri on 2014-09-25

prereq sync

1268. By Zsombor Egri on 2014-09-28

prereq sync

1269. By Zsombor Egri on 2014-09-29

prereq sync

1270. By Zsombor Egri on 2014-10-02

prereq sync

1271. By Zsombor Egri on 2014-10-13

prereq sync

1272. By Zsombor Egri on 2014-10-20

prereq sync

1273. By Zsombor Egri on 2014-10-22

prereq sync

1274. By Zsombor Egri on 2014-10-22

prereq sync

1275. By Zsombor Egri on 2014-10-24

prereq sync

1276. By Zsombor Egri on 2014-10-29

prereq sync

1277. By Zsombor Egri on 2014-10-29

painting last divider fixed

1278. By Zsombor Egri on 2014-10-29

rogue debug line removed

1279. By Zsombor Egri on 2014-10-31

prereq sync

1280. By Zsombor Egri on 2014-10-31

last item is checked on paint

1281. By Zsombor Egri on 2014-10-31

prereq sync

1282. By Zsombor Egri on 2014-11-03

prereq sync

1283. By Zsombor Egri on 2014-11-04

prereq sync

1284. By Zsombor Egri on 2014-11-12

prereq sync

1285. By Zsombor Egri on 2014-11-12

prereq sync

1286. By Zsombor Egri on 2014-11-17

prereq sync

1287. By Zsombor Egri on 2014-11-18

prereq sync

1288. By Zsombor Egri on 2014-11-19

prereq sync

1289. By Zsombor Egri on 2014-11-20

prereq sync

1290. By Zsombor Egri on 2014-11-24

prereq sync

1291. By Zsombor Egri on 2014-11-25

prereq sync

1292. By Zsombor Egri on 2014-11-25

prereq sync

1293. By Zsombor Egri on 2014-11-25

prereq sync

1294. By Zsombor Egri on 2014-11-25

prereq sync

1295. By Zsombor Egri on 2014-11-28

prereq sync

1296. By Zsombor Egri on 2014-12-01

prereq sync

1297. By Zsombor Egri on 2014-12-01

prereq sync

1298. By Zsombor Egri on 2014-12-01

prereq sync

[Tim Peeters (tpeeters)]

it works

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-12-01 16:01:35 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-12-01 16:01:38 +0000
@@ -23,6 +23,7 @@
 #include "ucubuntuanimation.h"
 #include "propertychange_p.h"
 #include "i18n.h"
+#include "quickutils.h"
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
@@ -249,7 +250,8 @@
 QSGNode *UCListItemDivider::paint(QSGNode *node, const QRectF &rect)
 {
     QSGRectangleNode *dividerNode = static_cast<QSGRectangleNode*>(node);
-    if (m_visible && (m_gradient.size() > 0) && ((m_colorFrom.alphaF() >= (1.0f / 255.0f)) || (m_colorTo.alphaF() >= (1.0f / 255.0f)))) {
+    bool lastItem = m_listItem->countOwner ? (m_listItem->index() == (m_listItem->countOwner->property("count").toInt() - 1)): false;
+    if (m_visible && !lastItem && (m_gradient.size() > 0) && ((m_colorFrom.alphaF() >= (1.0f / 255.0f)) || (m_colorTo.alphaF() >= (1.0f / 255.0f)))) {
         if (!dividerNode) {
             dividerNode = m_listItem->sceneGraphContext()->createRectangleNode();
         }
@@ -402,6 +404,12 @@
     animator->snap(0);
 }
 
+void UCListItemPrivate::_q_updateIndex()
+{
+    Q_Q(UCListItem);
+    q->update();
+}
+
 /*!
  * \qmlproperty Component ListItem::style
  * Holds the style of the component defining the components visualizing the leading/
@@ -647,6 +655,8 @@
  * Each ListItem has a thin divider shown on the bottom of the component. This
  * divider can be configured through the \c divider grouped property, which can
  * configure its margins from the edges of the ListItem as well as its visibility.
+ * When used in \c ListView or \l UbuntuListView, the last list item will not
+ * show the divider no matter of the visible property value set.
  *
  * ListItem can handle actions that can get tugged from front to back of the item.
  * These actions are Action elements visualized in panels attached to the front
@@ -733,6 +743,19 @@
     UCStyledItemBase::componentComplete();
     Q_D(UCListItem);
     d->ready = true;
+    /* We only deal with ListView, as for other cases we would need to check the children
+     * changes, which would have an enormous impact on performance in case of huge amount
+     * of items. However, if the parent item, or Flickable declares a "count" property,
+     * the ListItem will take use of it!
+     */
+    d->countOwner = (d->flickable && d->flickable->property("count").isValid()) ?
+                d->flickable :
+                (d->parentItem && d->parentItem->property("count").isValid()) ? d->parentItem : 0;
+    if (d->countOwner) {
+        QObject::connect(d->countOwner.data(), SIGNAL(countChanged()),
+                         this, SLOT(_q_updateIndex()), Qt::DirectConnection);
+        update();
+    }
 }
 
 void UCListItem::itemChange(ItemChange change, const ItemChangeData &data)
@@ -758,6 +781,8 @@
         } else if (data.item) {
             d->attachedProperties = static_cast<UCListItemAttached*>(qmlAttachedPropertiesObject<UCListItem>(data.item));
         } else {
+            // mark as not ready, so no action should be performed which depends on readyness
+            d->ready = false;
             // about to be deleted or reparented, disable attached
             d->attachedProperties = 0;
         }

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2014-12-01 16:01:35 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2014-12-01 16:01:38 +0000
@@ -98,6 +98,7 @@
     Q_PRIVATE_SLOT(d_func(), void _q_updateThemedData())
     Q_PRIVATE_SLOT(d_func(), void _q_rebound())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
 };
 
 QML_DECLARE_TYPEINFO(UCListItem, QML_HAS_ATTACHED_PROPERTIES)

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-12-01 16:01:35 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-12-01 16:01:38 +0000
@@ -47,6 +47,7 @@
     void _q_rebound();
     void promptRebound();
     void _q_updateSize();
+    void _q_updateIndex();
     int index();
     bool canHighlight(QMouseEvent *event);
     void setPressed(bool pressed);
@@ -73,6 +74,7 @@
     QPointF pressedPos;
     QColor color;
     QColor highlightColor;
+    QPointer<QQuickItem> countOwner;
     QPointer<QQuickFlickable> flickable;
     QPointer<UCListItemAttached> attachedProperties;
     QQuickItem *contentItem;

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2014-12-01 16:01:35 +0000
+++ tests/resources/listitems/ListItemTest.qml	2014-12-01 16:01:38 +0000
@@ -137,7 +137,7 @@
             clip: true
             width: parent.width
             height: units.gu(20)
-            model: 100
+            model: 10
             pressDelay: 0
             delegate: ListItem {
                 objectName: "ListItem" + index
@@ -171,8 +171,10 @@
             Column {
                 id: column
                 width: view.width
+                property alias count: repeater.count
                 Repeater {
-                    model: 100
+                    id: repeater
+                    model: 10
                     ListItem {
                         objectName: "InFlickable"+index
                         color: "red"

=== modified file 'tests/unit/tst_performance/ListItemList.qml'
--- tests/unit/tst_performance/ListItemList.qml	2014-12-01 16:01:35 +0000
+++ tests/unit/tst_performance/ListItemList.qml	2014-12-01 16:01:38 +0000
@@ -20,7 +20,9 @@
 Column {
     width: 800
     height: 600
+    property alias count: repeater.count
     Repeater {
+        id: repeater
         model: 5000
         ListItem {
         }