summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@nokia.com>2011-11-29 19:04:37 -0800
committerJens Bache-Wiig <jens.bache-wiig@nokia.com>2011-12-07 15:33:06 +0100
commitdfe0080179f362b9958ff9d11cfe59a6eb9dd1f9 (patch)
tree100b92f7b4b7386a8177e64f7074141bba675bb2
parent73e65cd23a32a8583ff41c43c8f18d94f23f9d9e (diff)
downloadqtquickcontrols-dfe0080179f362b9958ff9d11cfe59a6eb9dd1f9.tar.gz
Center items in linear layouts by default
This is needed to make sense of my devdays spotify example. - We still need to add Layout.horizontalAlignment and Layout.verticalAlignment to complete the API, but I anyway think centering is a better default. - Added some default layout spacing as well
-rw-r--r--src/qdeclarativelinearlayout.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qdeclarativelinearlayout.cpp b/src/qdeclarativelinearlayout.cpp
index 2f684950..a5e0260e 100644
--- a/src/qdeclarativelinearlayout.cpp
+++ b/src/qdeclarativelinearlayout.cpp
@@ -41,7 +41,7 @@
#include "qdeclarativelayoutengine_p.h"
#include <QtCore/qnumeric.h>
-static const qreal q_declarativeLayoutDefaultSpacing = 0.0;
+static const qreal q_declarativeLayoutDefaultSpacing = 4.0;
QDeclarativeLinearLayout::QDeclarativeLinearLayout(Orientation orientation,
@@ -214,6 +214,7 @@ void QDeclarativeLinearLayout::reconfigureLayout()
const QDeclarativeLayoutInfo &data = itemData.at(i);
item->setX(data.pos);
+ item->setY(height()/2 - item->height()/2);
item->setWidth(data.size);
}
} else {
@@ -224,6 +225,7 @@ void QDeclarativeLinearLayout::reconfigureLayout()
const QDeclarativeLayoutInfo &data = itemData.at(i);
item->setY(data.pos);
+ item->setX(width()/2 - item->width()/2);
item->setHeight(data.size);
}
}