summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Krupenko <krnekit@gmail.com>2012-09-27 17:49:04 +0300
committerMorten Johan Sørvig <morten.sorvig@digia.com>2012-09-27 17:30:38 +0200
commit0da57d8a951f5a0d7004deb91a0fa4391d493a47 (patch)
tree61fe2dca86f3055f7e339d8bc1ad98860d6d63a9
parentb7d98f2cf60368a0640037acbfadb4d6393d9525 (diff)
downloadqtquickcontrols-0da57d8a951f5a0d7004deb91a0fa4391d493a47.tar.gz
Fixed warnings about binding loop when moving SplitterColumn
When moving splitter in SplitterColumn, many warnings issued: QML Splitter: Binding loop detected for property "width" This commit fixes bug. Change-Id: If59accda9eddb6776c4cb417581369a668b7c625 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--components/custom/Splitter.qml9
1 files changed, 7 insertions, 2 deletions
diff --git a/components/custom/Splitter.qml b/components/custom/Splitter.qml
index 3bab46c9..905c984e 100644
--- a/components/custom/Splitter.qml
+++ b/components/custom/Splitter.qml
@@ -340,7 +340,8 @@ Splitter {
id: propertyChangeListener
Item {
id: target
- width: parent[d.size]
+ width: (d.horizontal ? parent[d.size] : 0)
+ height: (!d.horizontal ? parent[d.size] : 0)
property bool expanding: parent.Splitter.expanding
property real percentageSize: parent.Splitter.percentageSize
property real minimumWidth: parent.Splitter[d.minimum]
@@ -417,7 +418,11 @@ Splitter {
d.updateLayout()
// Restablish binding:
- width = function() { return parent[d.size]; }
+ if (d.horizontal) {
+ width = function() { return parent[d.size]; }
+ } else {
+ height = function() { return parent[d.size]; }
+ }
d.itemWidthGuard = false
}