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

[Zsombor Egri]

[lp:~zsombi/ubuntu-ui-toolkit/colorSelector]

1884. By Zsombor Egri on 2016-03-09

introduce PropertyBinding

1885. By Zsombor Egri on 2016-03-15

stage, unbildable

Unmerged revisions

1885. By Zsombor Egri on 2016-03-15

stage, unbildable

1884. By Zsombor Egri on 2016-03-09

introduce PropertyBinding

1883. By Zsombor Egri on 2016-03-07

bug

=== modified file 'debian/libubuntutoolkit5-dev.install'
--- debian/libubuntutoolkit5-dev.install	2016-03-04 11:58:12 +0000
+++ debian/libubuntutoolkit5-dev.install	2016-03-15 11:52:58 +0000
@@ -2,6 +2,8 @@
 usr/include/*/qt5/UbuntuToolkit/ColorUtils
 usr/include/*/qt5/UbuntuToolkit/Tree
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
+usr/include/*/qt5/UbuntuToolkit/PropertyBinding
+usr/include/*/qt5/UbuntuToolkit/propertybinding.h
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
 usr/include/*/qt5/UbuntuToolkit/asyncloader.h

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-02-29 16:50:41 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-03-15 11:52:58 +0000
@@ -29,6 +29,10 @@
     : oldParentItem(Q_NULLPTR)
     , styleComponent(Q_NULLPTR)
     , styleItem(Q_NULLPTR)
+    , highlighted(Q_NULLPTR)
+    , focused(Q_NULLPTR)
+    , selected(Q_NULLPTR)
+    , componentState(UCStyledItemBase::Undefined)
     , styleVersion(0)
     , keyNavigationFocus(false)
     , activeFocusOnPress(false)
@@ -62,6 +66,61 @@
     QObject::connect(q, &QQuickItem::activeFocusOnTabChanged, q, &UCStyledItemBase::activeFocusOnTabChanged2);
 }
 
+// initializes state builders
+void UCStyledItemBasePrivate::setupHighlightedStateBinging()
+{
+//    Q_Q(UCStyledItemBase);
+//    const QMetaObject *mo = q->metaObject();
+//    // detect highlight setup
+//    if (mo->indexOfProperty("pressed") > 0) {
+//        QMetaMethod change = mo->method(mo->indexOfSignal("pressedChanged()"));
+//        auto getter = [=] ()->bool {
+//            return QQmlProperty::read(q, "pressed", qmlContext(q)).toBool();
+//        };
+//        highlighted = new UbuntuToolkit::PropertyBinding<bool>(
+//                    getter,
+//                    std::bind(&UCStyledItemBase::componentStateChanged, q),
+//                    {UbuntuToolkit::ValueBinding(q, change)});
+//    } else if (mo->indexOfProperty("highlighted") > 0) {
+//        QMetaMethod change = mo->method(mo->indexOfSignal("highlightedChanged()"));
+//        auto getter = [=] ()->bool {
+//            return QQmlProperty::read(q, "highlighted", qmlContext(q)).toBool();
+//        };
+//        highlighted = new UbuntuToolkit::PropertyBinding<bool>(
+//                    getter,
+//                    std::bind(&UCStyledItemBase::componentStateChanged, q),
+//                    {UbuntuToolkit::ValueBinding(q, change)});
+//    }
+}
+
+void UCStyledItemBasePrivate::setupFocusedStateBinging()
+{
+    Q_Q(UCStyledItemBase);
+
+    auto b2ObjectGetter = [q]() -> QObject* {
+        return q->window();
+    };
+    UbuntuToolkit::Binding *b2 = new UbuntuToolkit::ExpressionBinding<QObject*>
+            (b2ObjectGetter, &QQuickWindow::activeFocusItemChanged);
+
+    UbuntuToolkit::Binding *b1;
+    auto b1Updater = [&b1]() {
+        b1->reconnect();
+        b1->update();
+    };
+    b1 = new UbuntuToolkit::UpdateBinding(q, &QQuickItem::windowChanged, b1Updater, {b2});
+
+    auto getter = [=] () -> bool {
+        return q->window() && q->window()->activeFocusItem() == q;
+    };
+    focused = new UbuntuToolkit::BindingExpression<bool>(getter, {b2});
+}
+
+void UCStyledItemBasePrivate::setupSelectedStateBinging()
+{
+
+}
+
 
 void UCStyledItemBasePrivate::setFocusable(bool focus)
 {
@@ -480,6 +539,35 @@
     d->loadStyleItem();
 }
 
+/*!
+ * \qmlproperty ComponentState StyledItem::componentState
+ * \readonly
+ * \since Ubuntu.Components 1.3
+ * The property reports the current state of the component.
+ */
+UCStyledItemBase::ComponentState UCStyledItemBase::componentState()
+{
+    Q_D(const UCStyledItemBase);
+    if (isEnabled()) {
+        if (d->highlighted && d->highlighted->value()) {
+            return Highlighted;
+        }
+        if (d->focused && d->focused->value()) {
+            return Focused;
+        }
+        if (d->selected && d->selected->value()) {
+            return Selected;
+        }
+        return Normal;
+    } else if (d->selected && d->selected->value()) {
+        return SelectedDisabled;
+    } else {
+        return Disabled;
+    }
+
+    return Undefined;
+}
+
 QString UCStyledItemBasePrivate::propertyForVersion(quint16 version) const
 {
     switch (MINOR_VERSION(version)) {
@@ -510,10 +598,16 @@
      * The member defaults to true. Additionally, the focus scope flag must
      * be set before the parentItem is set and child items are added.
      */
-    if (d_func()->isFocusScope) {
+    Q_D(UCStyledItemBase);
+    if (d->isFocusScope) {
         setFlag(QQuickItem::ItemIsFocusScope);
     }
     QQuickItem::classBegin();
+
+    // build state transitioners
+    d->setupHighlightedStateBinging();
+    d->setupFocusedStateBinging();
+    d->setupSelectedStateBinging();
 }
 
 void UCStyledItemBase::componentComplete()

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase.h	2016-01-16 15:52:56 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.h	2016-03-15 11:52:58 +0000
@@ -25,6 +25,7 @@
 class UCStyledItemBasePrivate;
 class UCTheme;
 class UCStyleHints;
+class StyledItemAttached;
 class UCStyledItemBase : public QQuickItem, public UCThemingExtension
 {
     Q_OBJECT
@@ -45,7 +46,19 @@
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY styleInstanceChanged FINAL DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged FINAL REVISION 2)
     Q_PROPERTY(UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL REVISION 2)
+    Q_PROPERTY(ComponentState componentState READ componentState NOTIFY componentStateChanged FINAL REVISION 2)
+    Q_ENUMS(ComponentState)
 public:
+    enum ComponentState {
+        Undefined,
+        Normal,
+        Highlighted,
+        Focused,
+        Selected,
+        Disabled,
+        SelectedDisabled
+    };
+
     explicit UCStyledItemBase(QQuickItem *parent = 0);
 
     virtual bool keyNavigationFocus() const;
@@ -53,6 +66,7 @@
     void setActiveFocusOnPress(bool value);
     bool activeFocusOnTab2() const;
     void setActiveFocusOnTab2(bool value);
+    ComponentState componentState();
 
 public Q_SLOTS:
     Q_REVISION(1) bool requestFocus(Qt::FocusReason reason = Qt::OtherFocusReason);
@@ -65,6 +79,7 @@
     Q_REVISION(1) void activeFocusOnTabChanged2();
     Q_REVISION(2) void themeChanged();
     Q_REVISION(2) void styleNameChanged();
+    Q_REVISION(2) void componentStateChanged();
 
 protected:
     UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2016-01-16 10:55:26 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2016-03-15 11:52:58 +0000
@@ -23,6 +23,7 @@
 #include "ucstyleditembase.h"
 #include "ucthemingextension.h"
 #include "ucimportversionchecker_p.h"
+#include <UbuntuToolkit/PropertyBinding>
 
 class QQuickMouseArea;
 class UCStyledItemBase;
@@ -41,6 +42,9 @@
     UCStyledItemBasePrivate();
     virtual ~UCStyledItemBasePrivate();
     void init();
+    virtual void setupHighlightedStateBinging();
+    virtual void setupFocusedStateBinging();
+    virtual void setupSelectedStateBinging();
 
     virtual void setFocusable(bool focus);
     bool isParentFocusable();
@@ -68,6 +72,10 @@
     QQuickItem *oldParentItem;
     QQmlComponent *styleComponent;
     QQuickItem *styleItem;
+    UbuntuToolkit::BindingExpression<bool> *highlighted;
+    UbuntuToolkit::BindingExpression<bool> *focused;
+    UbuntuToolkit::BindingExpression<bool> *selected;
+    UCStyledItemBase::ComponentState componentState;
     quint16 styleVersion;
     bool keyNavigationFocus:1;
     bool activeFocusOnPress:1;

=== modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-02-25 14:35:59 +0000
+++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-03-15 11:52:58 +0000
@@ -17,9 +17,11 @@
     ubuntutoolkitglobal.h \
     tree.h \
     asyncloader.h \
-    asyncloader_p.h
+    asyncloader_p.h \
+    propertybinding.h
 
 SOURCES += \ 
     colorutils.cpp \
     tree.cpp \
-    asyncloader.cpp
+    asyncloader.cpp \
+    propertybinding.cpp

=== added file 'src/Ubuntu/UbuntuToolkit/propertybinding.cpp'
--- src/Ubuntu/UbuntuToolkit/propertybinding.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/propertybinding.cpp	2016-03-15 11:52:58 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "propertybinding.h"
+#include <QtCore/QMetaMethod>
+
+namespace UbuntuToolkit {
+
+/******************************************************************************
+ * Binding
+ */
+
+Binding::Binding(const Bindings &bindings, Binding *parent)
+    : m_parent(parent)
+{
+    for (Binding *b : bindings) {
+        addChild(b);
+    }
+}
+
+Binding::~Binding()
+{
+    if (m_parent) {
+        int idx = m_parent->m_children.indexOf(this);
+        if (idx >= 0) {
+            m_parent->m_children.remove(idx);
+        }
+    }
+}
+
+Binding *Binding::parent()
+{
+    return m_parent;
+}
+void Binding::addChild(Binding *binding)
+{
+    m_children.append(binding);
+    binding->m_parent = this;
+}
+
+void Binding::connectExpression(BindingUpdateExpression *expression)
+{
+    m_expression = expression;
+    // TODO: connect the binding to the expression's update()
+}
+
+void Binding::reconnect()
+{
+    Q_FOREACH(Binding *b, m_children) {
+        b->reconnect();
+    }
+}
+
+
+/******************************************************************************
+ * UpdateNotifier
+ */
+
+/******************************************************************************
+ * Binding
+ */
+
+} // namespace

=== added file 'src/Ubuntu/UbuntuToolkit/propertybinding.h'
--- src/Ubuntu/UbuntuToolkit/propertybinding.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/propertybinding.h	2016-03-15 11:52:58 +0000
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef PROPERTYBINDING_H
+#define PROPERTYBINDING_H
+
+#include <QtCore/QObject>
+#include <QtQml/QQmlProperty>
+#include <functional>
+#include <initializer_list>
+#include <tuple>
+#include "ubuntutoolkitglobal.h"
+
+namespace UbuntuToolkit {
+
+class UBUNTUTOOLKIT_EXPORT BindingUpdateExpression
+{
+public:
+    virtual void update() {}
+};
+
+class UBUNTUTOOLKIT_EXPORT Binding
+{
+public:
+    typedef std::initializer_list<Binding*> Bindings;
+
+    explicit Binding(const Bindings &bindings = {}, Binding *parent = 0);
+    virtual ~Binding();
+
+    void connectExpression(BindingUpdateExpression *expression);
+
+    // FIXME perhaps call it as update? would collide with the BindingExpression's update
+    virtual void reconnect();
+
+    Binding *parent();
+protected:
+    BindingUpdateExpression *m_expression = nullptr;
+    QMetaObject::Connection *m_connection = nullptr;
+    QVarLengthArray<Binding*, 4> m_children;
+
+private:
+    Binding *m_parent;
+    void addChild(Binding *binding);
+};
+
+//
+// Signal to slot connector
+//
+typedef std::function<QMetaObject::Connection(QObject *s, QObject *r)> Connector;
+template <typename Sender, typename Receiver, typename Signal, typename Slot>
+Connector createConnector (Signal sig, Slot sl)
+{
+    return [sig, sl] (QObject *s, QObject *r){
+        Sender *sender = static_cast<Sender *>(s);
+        Receiver *receiver = static_cast<Receiver *>(r);
+
+        return QObject::connect(sender, sig, receiver, sl);
+    };
+}
+
+//
+// Signal to lambda connector
+//
+typedef std::function<QMetaObject::Connection(QObject *s)> LConnector;
+template <typename Sender, typename Signal, typename Receiver>
+LConnector createConnector (Signal sig, Receiver rec)
+{
+    return [sig, rec] (QObject *s){
+        Sender *sender = static_cast<Sender *>(s);
+
+        return QObject::connect(sender, sig, rec);
+    };
+}
+//
+// UpdateBinding (or maybe ReconnectBinding?)
+//
+class UBUNTUTOOLKIT_EXPORT UpdateBinding : public Binding
+{
+public:
+    UpdateBinding(QObject *sender, Signal signal, const Bindings &bindings = {}, Binding *parent = 0)
+        : Binding(bindings, parent)
+        , m_sender(sender)
+        , m_signal(signal)
+    {
+        // TODO: connect m_signal to reconnect()
+    }
+
+    void reconnect() override
+    {
+        // reconnect kids first
+        Binding::reconnect();
+        // ivoke expression's update too
+        m_expression->update();
+    }
+
+private:
+    QObject *m_sender;
+    Signal m_signal;
+};
+
+//
+// PropertyBinding
+//
+template<typename T>
+class UBUNTUTOOLKIT_EXPORT ExpressionBinding : public Binding
+{
+public:
+    typedef std::function<T()> Expression;
+
+    explicit ExpressionBinding(Expression expression, LConnector connector, const Bindings &bindings = {}, Binding *parent = 0)
+        : Binding(bindings, parent)
+        , m_expression(expression)
+    {
+//        m_signal = createConnector<QObject>(Signal, &Binding::update);
+    }
+
+    void reconnect() override
+    {
+        if (connection) {
+            QObject::disconnect(*connection);
+        }
+        // TODO oupdate connection
+        Binding::reconnect();
+    }
+private:
+    Expression m_expression;
+    LConnector m_signal;
+};
+
+
+//
+// BindingExpression
+//
+
+template<typename T>
+class UBUNTUTOOLKIT_EXPORT BindingExpression : private BindingUpdateExpression
+{
+public:
+    typedef T ElementType;
+
+    typedef std::function<ElementType()> GetterFunc;
+
+    typedef std::function<void()> BindingSignal;
+
+    explicit BindingExpression(GetterFunc getter, BindingSignal signal, const Binding::Bindings &bindings)
+        : getter(getter)
+        , signal(signal)
+        , propertyValue(getter())
+    {
+        init(bindings);
+    }
+    ~BindingExpression()
+    {
+        qDeleteAll(bindings);
+        bindings.clear();
+    }
+
+    T value()
+    {
+        return propertyValue;
+    }
+
+private:
+    void init(const Binding::Bindings &bindings)
+    {
+        Q_UNUSED(bindings);
+        for (Binding *b : bindings) {
+            this->bindings.append(b);
+            // hook update
+            b->connectExpression(this);
+        }
+    }
+
+    void update() override
+    {
+        ElementType newValue = getter();
+        if (newValue == propertyValue) {
+            return;
+        }
+        propertyValue = newValue;
+        signal();
+    }
+
+    GetterFunc getter;
+    QVarLengthArray<Binding*, 4 > bindings;
+    BindingSignal signal;
+    ElementType propertyValue;
+};
+
+} // namespace UbuntuToolkit
+
+#endif // PROPERTYBINDING_H

=== modified file 'tests/unit/plugin_dependency.pri'
--- tests/unit/plugin_dependency.pri	2016-03-10 05:25:02 +0000
+++ tests/unit/plugin_dependency.pri	2016-03-15 11:52:58 +0000
@@ -9,7 +9,11 @@
 LIBS += -L$$PLUGIN_BLD/Components -lUbuntuComponents
 LIBS += -L$$PLUGIN_BLD/Test -lUbuntuTest
 LIBS += -L$${ROOT_BUILD_DIR}/lib -lUbuntuGestures
+<<<<<<< TREE
 LIBS += -L$$PLUGIN_BLD/UbuntuToolkit -lUbuntuToolkit
+=======
+LIBS += -L$${ROOT_BUILD_DIR}/lib -lUbuntuToolkit
+>>>>>>> MERGE-SOURCE
 DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
 QMAKE_CXXFLAGS += -Werror
 

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-03-14 17:08:59 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-03-15 11:52:58 +0000
@@ -1,5 +1,5 @@
 include(../test-include.pri)
-QT += core-private qml-private quick-private gui-private
+QT += core-private qml-private quick-private gui-private UbuntuToolkit
 SOURCES += tst_subtheming.cpp
 
 OTHER_FILES += \