Allow aligning items in a grid

This change introduces two new properties, horizontalItemAlignment and verticalItemAlignment to a
Grid element. This gives the user the possibility to align the items.

Change-Id: I7322a689f1bbc1da342bd618f6c30dd8c139ee29
Reviewed-by: Alan Alpert <aalpert@rim.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index aeb722dd60..1ff5a7a74c 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -220,6 +220,9 @@ class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
+    Q_PROPERTY(HAlignment horizontalItemAlignment READ hItemAlign WRITE setHItemAlign NOTIFY horizontalAlignmentChanged REVISION 1)
+    Q_PROPERTY(HAlignment effectiveHorizontalItemAlignment READ effectiveHAlign NOTIFY effectiveHorizontalAlignmentChanged REVISION 1)
+    Q_PROPERTY(VAlignment verticalItemAlignment READ vItemAlign WRITE setVItemAlign NOTIFY verticalAlignmentChanged REVISION 1)
 
 public:
     QQuickGrid(QQuickItem *parent=0);
@@ -247,6 +250,22 @@ public:
     void setLayoutDirection (Qt::LayoutDirection);
     Qt::LayoutDirection effectiveLayoutDirection() const;
 
+    Q_ENUMS(HAlignment)
+    Q_ENUMS(VAlignment)
+    enum HAlignment { AlignLeft = Qt::AlignLeft,
+                       AlignRight = Qt::AlignRight,
+                       AlignHCenter = Qt::AlignHCenter};
+    enum VAlignment { AlignTop = Qt::AlignTop,
+                       AlignBottom = Qt::AlignBottom,
+                       AlignVCenter = Qt::AlignVCenter };
+
+    HAlignment hItemAlign() const;
+    void setHItemAlign(HAlignment align);
+    HAlignment effectiveHAlign() const;
+
+    VAlignment vItemAlign() const;
+    void setVItemAlign(VAlignment align);
+
 Q_SIGNALS:
     void rowsChanged();
     void columnsChanged();
@@ -255,6 +274,9 @@ Q_SIGNALS:
     void effectiveLayoutDirectionChanged();
     void rowSpacingChanged();
     void columnSpacingChanged();
+    Q_REVISION(1) void horizontalAlignmentChanged(HAlignment alignment);
+    Q_REVISION(1) void effectiveHorizontalAlignmentChanged(HAlignment alignment);
+    Q_REVISION(1) void verticalAlignmentChanged(VAlignment alignment);
 
 protected:
     virtual void doPositioning(QSizeF *contentSize);
@@ -268,6 +290,8 @@ private:
     bool m_useRowSpacing;
     bool m_useColumnSpacing;
     Flow m_flow;
+    HAlignment m_hItemAlign;
+    VAlignment m_vItemAlign;
     Q_DISABLE_COPY(QQuickGrid)
 };