Merge lp:~zsombi/ubuntu-ui-toolkit/65-last-divider-invisible into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

[Zsombor Egri]

No divider shown for the last ListItem in a ListView or where a "count" property is present in the parent item.

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

1251. By Zsombor Egri on 2014-09-15

prereq

1252. By Zsombor Egri on 2014-09-15

prereq

1253. By Zsombor Egri on 2014-09-15

removed clause restored

1254. By Zsombor Egri on 2014-09-15

prereq

1255. By Zsombor Egri on 2014-09-16

prereq

1256. By Zsombor Egri on 2014-09-17

prereq

1257. By Zsombor Egri on 2014-09-17

remove documentation which describes the 'easter egg'

1258. By Zsombor Egri on 2014-09-17

prereq

1259. By Zsombor Egri on 2014-09-17

prereq

1260. By Zsombor Egri on 2014-09-17

prereq

1261. By Zsombor Egri on 2014-09-17

prereq

1262. By Zsombor Egri on 2014-09-18

prereq

1263. By Zsombor Egri on 2014-09-18

prereq sync

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

Unmerged revisions

1298. By Zsombor Egri on 2014-12-01

prereq sync

1297. By Zsombor Egri on 2014-12-01

prereq sync

1296. By Zsombor Egri on 2014-12-01

prereq sync

1295. By Zsombor Egri on 2014-11-28

prereq sync

1294. By Zsombor Egri on 2014-11-25

prereq sync

1293. By Zsombor Egri on 2014-11-25

prereq sync

1292. By Zsombor Egri on 2014-11-25

prereq sync

1291. By Zsombor Egri on 2014-11-25

prereq sync

1290. By Zsombor Egri on 2014-11-24

prereq sync

1289. By Zsombor Egri on 2014-11-20

prereq sync

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-15 08:46:01 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-15 08:46:02 +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>
@@ -50,6 +51,7 @@
 UCListItemDivider::UCListItemDivider(QObject *parent)
     : QObject(parent)
     , m_visible(true)
+    , m_lastItem(false)
     , m_leftMarginChanged(false)
     , m_rightMarginChanged(false)
     , m_colorFromChanged(false)
@@ -123,7 +125,7 @@
 
 QSGNode *UCListItemDivider::paint(QSGNode *paintNode, const QRectF &rect)
 {
-    if (m_visible && (m_gradient.size() > 0)) {
+    if (m_visible && !m_lastItem && (m_gradient.size() > 0)) {
         QSGRectangleNode *rectNode = static_cast<QSGRectangleNode *>(paintNode);
         if (!rectNode) {
             rectNode = m_listItem->sceneGraphContext()->createRectangleNode();
@@ -358,6 +360,22 @@
     grabPanel(trailingOptions, false);
 }
 
+void UCListItemPrivate::_q_updateIndex(QObject *ownerItem)
+{
+    Q_Q(UCListItem);
+    if (!ownerItem) {
+        ownerItem = q->sender();
+    }
+    Q_ASSERT(ownerItem);
+    // update the index as well
+    QQmlContext *context = qmlContext(q);
+    if (context) {
+        QVariant indexProperty = context->contextProperty("index");
+        index = indexProperty.isValid() ? indexProperty.toInt() : -1;
+    }
+    divider->m_lastItem = ready && index == (ownerItem->property("count").toInt() - 1);
+}
+
 // the function performs a cleanup on mouse release without any rebound animation
 void UCListItemPrivate::cleanup()
 {
@@ -503,6 +521,28 @@
  * Each ListItem has a thin divider shown on the bottom of the component. This
  * divider can be configured through the \l 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. In other
+ * circumstances declaring a \c count property in the ListItem's parent item
+ * or Flickable can help applying the last item detection logic.
+ * \qml
+ * Column {
+ *     width: units.gu(40)
+ *     // bring count to Column from Repeater
+ *     property alias count: repeater.count
+ *     Repeater {
+ *         model: 10
+ *         ListItem {
+ *             Label {
+ *                 anchors.fill: parent
+ *                 horizontalCenter: Text.AlignHCenter
+ *                 verticalCenter: Text.AlignVCenter
+ *                 text: "Item #" + modelData
+ *             }
+ *         }
+ *     }
+ * }
+ * \endqml
  *
  * ListItem can handle options that can ge tugged from front ot right of the item.
  * These options are Action elements visualized in panels attached to the front
@@ -574,11 +614,18 @@
     UCStyledItemBase::componentComplete();
     Q_D(UCListItem);
     d->ready = true;
-    // is there an index context property?
-    QQmlContext *context = qmlContext(this);
-    QVariant index = context->contextProperty("index");
-    if (index.isValid()) {
-        d->index = index.toInt();
+    /* 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!
+     */
+    QQuickItem *countOwner = (d->flickable && d->flickable->property("count").isValid()) ?
+                d->flickable :
+                (d->parentItem && d->parentItem->property("count").isValid()) ? d->parentItem : 0;
+    if (countOwner) {
+        QObject::connect(countOwner, SIGNAL(countChanged()),
+                         this, SLOT(_q_updateIndex()), Qt::DirectConnection);
+        d->_q_updateIndex(countOwner);
     }
 }
 
@@ -611,6 +658,8 @@
                 delete d->flickableInteractive;
                 d->flickableInteractive = 0;
             }
+            // mar as not ready, so no action should be performed which depends on readyness
+            d->ready = false;
         }
 
         // update size

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2014-09-15 08:46:01 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2014-09-15 08:46:02 +0000
@@ -74,6 +74,7 @@
     Q_PRIVATE_SLOT(d_func(), void _q_rebound())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
     Q_PRIVATE_SLOT(d_func(), void _q_completeRebinding())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateIndex(QObject *ownerItem = 0))
 };
 
 #endif // UCLISTITEM_H

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-15 08:46:01 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-15 08:46:02 +0000
@@ -48,6 +48,7 @@
     void _q_rebound();
     void _q_updateSize();
     void _q_completeRebinding();
+    void _q_updateIndex(QObject *ownerItem = 0);
     void cleanup();
     void reboundTo(qreal x);
     void setPressed(bool pressed);
@@ -141,6 +142,7 @@
     void setColorTo(const QColor &color);
 
     bool m_visible:1;
+    bool m_lastItem:1;
     bool m_leftMarginChanged:1;
     bool m_rightMarginChanged:1;
     bool m_colorFromChanged:1;

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2014-09-15 08:46:01 +0000
+++ tests/resources/listitems/ListItemTest.qml	2014-09-15 08:46:02 +0000
@@ -98,7 +98,7 @@
             clip: true
             width: parent.width
             height: units.gu(20)
-            model: 100
+            model: 10
             pressDelay: 0
             delegate: ListItem {
                 objectName: "ListItem" + index
@@ -127,8 +127,10 @@
             Column {
                 id: column
                 width: view.width
+                property alias count: repeater.count
                 Repeater {
-                    model: 100
+                    id: repeater
+                    model: 10
                     ListItem {
                         objectName: "InFlickable"+index
                         leadingOptions: ListItemOptions {

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