Merge lp:~zsombi/ubuntu-ui-toolkit/lambdaSegfault into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Update BottomEdge with UI/UX agreed during the sprint.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1741
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2562/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1292
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1289

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2562/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

good.

But we should not forget about the header background/clipping for AppHeader.

review: Approve

=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-11-26 14:57:05 +0000
+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-12-03 12:10:20 +0000
@@ -62,21 +62,6 @@
         }
 
         TemplateRow {
-            title: i18n.tr("Hint")
-            Row {
-                spacing: units.gu(1)
-                CheckBox {
-                    id: attachHintToContent
-                    text: i18n.tr("attach hint to content")
-                }
-                Label {
-                    text: attachHintToContent.text
-                    anchors.verticalCenter: attachHintToContent.verticalCenter
-                }
-            }
-        }
-
-        TemplateRow {
             title: i18n.tr("Regions")
             Slider {
                 id: regionCount
@@ -135,10 +120,6 @@
         }
         contentComponent: bottomEdgeContent
 
-        StyleHints {
-            attachHintToContent: attachHintToContent.checked
-        }
-
         onCommitCompleted: {
             if (contentToLayout.checked && contentToLayout.enabled) {
                 page.pageStack.addPageToCurrentColumn(page, contentComponent);

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-11-25 06:27:07 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-03 12:10:20 +0000
@@ -27,10 +27,9 @@
     revealThreshold: bottomEdge.hint.height + units.gu(2)
 
     // own styling properties
-    property color backgroundColor: "transparent"
-    property color panelColor: theme.palette.normal.background
-    property color shadowColor: theme.palette.selected.background
-    property bool attachHintToContent: false
+    property color backgroundColor: Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
+    property color panelColor: theme.palette.normal.overlay
+    property color shadowColor: "#000000"
 
     anchors.fill: parent
 
@@ -41,15 +40,6 @@
         z: -1
     }
 
-    states: State {
-        name: "reparentedHint"
-        when: attachHintToContent
-        AnchorChanges {
-            target: bottomEdge.hint
-            anchors.bottom: panelItem.top
-        }
-    }
-
     Rectangle {
         id: panelItem
         objectName: "bottomedge_panel"
@@ -67,13 +57,14 @@
 
         Behavior on anchors.topMargin { UbuntuNumberAnimation { id: panelBehavior } }
 
-        state: bottomEdge.status > BottomEdge.Hidden ? "lock-hint" : ""
+        state: bottomEdge.status > BottomEdge.Hidden ? "drop-hint" : ""
         states: [
             State {
-                name: "lock-hint"
+                name: "drop-hint"
                 PropertyChanges {
                     target: bottomEdge.hint
-                    status: BottomEdgeHint.Locked
+                    restoreEntryValues: false
+                    status: BottomEdgeHint.Inactive
                 }
             }
         ]
@@ -86,10 +77,11 @@
                 left: parent.left
                 right: parent.right
             }
-            height: units.gu(1)
+            height: units.gu(1.5)
             gradient: Gradient {
                 GradientStop { position: 0.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.0) }
-                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.3) }
+                GradientStop { position: 0.75; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.05) }
+                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.1) }
             }
         }
         Rectangle {
@@ -99,11 +91,12 @@
                 left: parent.left
                 right: parent.right
             }
-            height: units.gu(1)
+            height: units.gu(1.5)
             rotation: 180
             gradient: Gradient {
                 GradientStop { position: 0.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.0) }
-                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.3) }
+                GradientStop { position: 0.75; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.05) }
+                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.1) }
             }
         }
 

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-11-27 10:36:08 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-12-03 12:10:20 +0000
@@ -282,9 +282,13 @@
 // proceed with drag completion action
 void UCBottomEdgePrivate::onDragEnded()
 {
-    if (!activeRegion || (dragDirection == UCBottomEdge::Downwards)) {
+    // collapse if we drag downwards, or not in any active region and we did not pass 30% of the BottomEdge height
+    if (dragDirection == UCBottomEdge::Downwards || (!activeRegion && dragProgress < 0.33)) {
         q_func()->collapse();
-    } else {
+    } else if (!activeRegion && dragProgress >= 0.33) {
+        // commit if we are not in an active region but we passed 30% of the BottomEdge height
+        q_func()->commit();
+    } else if (activeRegion) {
         // emit region's dragEnded first
         Q_EMIT activeRegion->dragEnded();
         commit(activeRegion->m_to);
@@ -374,6 +378,10 @@
     : UCAction(parent)
 {
     QQmlEngine::setObjectOwnership(this, QQmlEngine::objectOwnership(parent));
+}
+
+void UCCollapseAction::activate()
+{
     setIconName("down");
 }
 
@@ -382,7 +390,7 @@
 {
     // ugly, as it can be, as we don't have the PageHeader in cpp to detect the type
     UCHeader *header = bottomPanel->m_contentItem ? bottomPanel->m_contentItem->findChild<UCHeader*>() : Q_NULLPTR;
-    if (!header || !QuickUtils::inherits(header, "PageHeader") || status != UCBottomEdge::Committed) {
+    if (!header || !QuickUtils::inherits(header, "PageHeader")) {
         return;
     }
 
@@ -391,13 +399,23 @@
     QQmlListProperty<UCAction> actions = list.value< QQmlListProperty<UCAction> >();
     QList<UCAction*> *navigationActions = reinterpret_cast<QList<UCAction*>*>(actions.data);
 
-    // clear the actions first
-    navigationActions->clear();
-
-    // inject the action
-    UCAction *collapse = new UCCollapseAction(header);
-    QObject::connect(collapse, &UCAction::triggered, q_func(), &UCBottomEdge::collapse, Qt::DirectConnection);
-    navigationActions->append(collapse);
+    // are we committed?
+    if (status == UCBottomEdge::Committed) {
+        // activate the action
+        UCCollapseAction *collapse = qobject_cast<UCCollapseAction*>(navigationActions->at(0));
+        collapse->activate();
+        QObject::connect(collapse, &UCAction::triggered, q_func(), &UCBottomEdge::collapse, Qt::DirectConnection);
+    } else if (navigationActions->size() <= 0) {
+        navigationActions->append(new UCCollapseAction(header));
+    } else {
+        // we have actions in the navigationActions array, check if those are UCCollapseActions,
+        // if not, clear them
+        UCCollapseAction *collapse = qobject_cast<UCCollapseAction*>(navigationActions->at(0));
+        if (!collapse) {
+            navigationActions->clear();
+            navigationActions->append(new UCCollapseAction(header));
+        }
+    }
 
     // invoke PageHeader.navigationActionsChanged signal
     int signal = header->metaObject()->indexOfSignal("navigationActionsChanged()");

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-11-26 15:49:24 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-03 12:10:20 +0000
@@ -105,6 +105,7 @@
     Q_OBJECT
 public:
     UCCollapseAction(QObject *parent = 0);
+    void activate();
 };
 Q_DECLARE_METATYPE(QQmlListProperty<UCAction>)
 

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-20 05:58:34 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-12-03 12:10:20 +0000
@@ -21,6 +21,7 @@
 #include "quickutils.h"
 #include "ucunits.h"
 #include "gestures/ucswipearea.h"
+#include "propertychange_p.h"
 #include <QtQml/private/qqmlproperty_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
 
@@ -79,12 +80,7 @@
 
     // FIXME: use QInputDeviceInfo once available
     // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
-    connect(&QuickUtils::instance(), &QuickUtils::mouseAttachedChanged, [this]() {
-        setStatus(QuickUtils::instance().mouseAttached() ? Locked : Active);
-        if (m_status == Active) {
-            m_deactivationTimer.start(m_deactivateTimeout, this);
-        }
-    });
+    connect(&QuickUtils::instance(), &QuickUtils::mouseAttachedChanged, this, &UCBottomEdgeHint::onMouseAttached);
 
     // accept mouse events
     setAcceptedMouseButtons(Qt::LeftButton);
@@ -116,15 +112,41 @@
     m_swipeArea->setDirection(UCSwipeArea::Upwards);
 
     // grid unit sync
-    connect(&UCUnits::instance(), &UCUnits::gridUnitChanged, [this] {
-        m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
-    });
+    connect(&UCUnits::instance(), &UCUnits::gridUnitChanged, this, &UCBottomEdgeHint::onGridUnitChanged);
 
     // connect to gesture detection
     connect(m_swipeArea, &UCSwipeArea::draggingChanged,
             this, &UCBottomEdgeHint::onDraggingChanged, Qt::DirectConnection);
 }
 
+void UCBottomEdgeHint::onMouseAttached()
+{
+    setStatus(QuickUtils::instance().mouseAttached() ? Locked : Active);
+    if (m_status == Active) {
+        m_deactivationTimer.start(m_deactivateTimeout, this);
+        if (m_flickableBottomMargin) {
+            delete m_flickableBottomMargin;
+            m_flickableBottomMargin = Q_NULLPTR;
+        }
+    } else if (m_flickable) {
+        adjustFlickableBottomMargin();
+    }
+}
+
+void UCBottomEdgeHint::adjustFlickableBottomMargin()
+{
+    if (!m_flickableBottomMargin) {
+        m_flickableBottomMargin = new PropertyChange(m_flickable, "bottomMargin");
+    }
+    PropertyChange::setValue(m_flickableBottomMargin, height());
+    m_flickable->setContentY(m_flickable->contentY() + height());
+}
+
+void UCBottomEdgeHint::onGridUnitChanged()
+{
+    m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
+}
+
 void UCBottomEdgeHint::itemChange(ItemChange change, const ItemChangeData &data)
 {
     UCActionItem::itemChange(change, data);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-11-17 14:24:24 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-12-03 12:10:20 +0000
@@ -23,6 +23,7 @@
 
 class QQuickFlickable;
 class UCSwipeArea;
+class PropertyChange;
 class UCBottomEdgeHint : public UCActionItem
 {
     Q_OBJECT
@@ -79,16 +80,21 @@
     void onDraggingChanged(bool dragging);
 
     void init();
+    void onMouseAttached();
+    void onGridUnitChanged();
 
 private:
     QBasicTimer m_deactivationTimer;
     UCSwipeArea *m_swipeArea;
     QQuickFlickable *m_flickable;
+    PropertyChange *m_flickableBottomMargin = nullptr;
     int m_deactivateTimeout;
     Status m_status;
     bool m_pressed:1;
 
     friend class UCBottomEdge;
+
+    void adjustFlickableBottomMargin();
 };
 
 #endif // UCBOTTOMEDGEHINT_H

=== added file 'tests/unit_x11/tst_bottomedge/UncoveredByRegion.qml'
--- tests/unit_x11/tst_bottomedge/UncoveredByRegion.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/UncoveredByRegion.qml	2015-12-03 12:10:20 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        hint.text: "Test"
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            objectName: "defaultContent"
+            width: holder.width
+            height: holder.height
+            color: UbuntuColors.green
+        }
+
+        BottomEdgeRegion {
+            to: 0.5
+            contentComponent: Rectangle {
+                objectName: "regionContent"
+                width: holder.width - units.gu(20)
+                height: holder.height
+                color: UbuntuColors.red
+            }
+        }
+    }
+}
+

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2015-11-27 10:36:08 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2015-12-03 12:10:20 +0000
@@ -688,17 +688,13 @@
     {
         QFETCH(bool, withMouse);
 
-        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateDefaultRegionContent.qml"));
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("UncoveredByRegion.qml"));
         UCBottomEdge *bottomEdge = test->testItem();
         UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
         UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
 
-        // alter region values to adjust to the test
-        region->m_from = 0.1;
-        region->m_to = 0.5;
-
-        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
-        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - UCUnits::instance().gu(10)));
         // let us know when we are out of the region
         QSignalSpy exitRegion(region, SIGNAL(exited()));
 
@@ -708,26 +704,28 @@
             to = bottomEdge->mapToScene(to).toPoint();
             QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
             QPoint movePos(from);
-            while (movePos.y() > to.y() && !exitRegion.count()) {
+            while (movePos.y() > to.y()) {
                 QTest::mouseMove(bottomEdge->window(), movePos, 20);
-                movePos += QPoint(0, -10);
+                movePos += QPoint(0, -20);
             }
+            movePos -= QPoint(0, -20);
             QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
         } else {
             UCTestExtras::touchPress(0, bottomEdge, from);
             QPoint movePos(from);
-            while (movePos.y() > to.y() && !exitRegion.count()) {
+            while (movePos.y() > to.y()) {
                 QTest::qWait(20);
                 UCTestExtras::touchMove(0, bottomEdge, movePos);
-                movePos += QPoint(0, -10);
+                movePos += QPoint(0, -20);
             }
+            movePos -= QPoint(0, -20);
             QTest::qWait(20);
             UCTestExtras::touchRelease(0, bottomEdge, movePos);
         }
 
         QVERIFY(!bottomEdge->activeRegion());
         // we should be collapsing!
-        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Hidden, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
     }
 
     void test_commit_region_content_data()

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2015-11-27 10:36:08 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2015-12-03 12:10:20 +0000
@@ -20,4 +20,5 @@
     OverlappingRegions.qml \
     AutoCollapseInPageHeader.qml \
     AutoCollapseInPageWithPageHeader.qml \
-    LeanActiveRegionChange.qml
+    LeanActiveRegionChange.qml \
+    UncoveredByRegion.qml