summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@nokia.com>2011-11-21 15:17:49 +0100
committerJens Bache-Wiig <jens.bache-wiig@nokia.com>2011-11-21 15:19:50 +0100
commit4095a5cfb5258b66bdae0b898a053a3b917b3fde (patch)
tree8415e50b6356b8044429132d614228234bf5410d
parentb6f7b738d80869affab6810eb053d80c746cf3f5 (diff)
downloadqtquickcontrols-4095a5cfb5258b66bdae0b898a053a3b917b3fde.tar.gz
Fix for expanding size policy
We need to set the stretch factor when the size policy is expanding. Reviewed-by: adriano
-rw-r--r--src/qdeclarativelinearlayout.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdeclarativelinearlayout.cpp b/src/qdeclarativelinearlayout.cpp
index b28838a6..2f684950 100644
--- a/src/qdeclarativelinearlayout.cpp
+++ b/src/qdeclarativelinearlayout.cpp
@@ -185,11 +185,13 @@ void QDeclarativeLinearLayout::reconfigureLayout()
data.minimumSize = info->minimumWidth();
data.maximumSize = info->maximumWidth();
data.expansive = (info->horizontalSizePolicy() == QDeclarativeLayout::Expanding);
+ data.stretch = info->horizontalSizePolicy() == Expanding ? 1.0 : 0;
} else {
data.sizeHint = item->implicitHeight();
data.minimumSize = info->minimumHeight();
data.maximumSize = info->maximumHeight();
data.expansive = (info->verticalSizePolicy() == QDeclarativeLayout::Expanding);
+ data.stretch = info->verticalSizePolicy() == Expanding ? 1.0 : 0;
}
itemData.append(data);