diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-09 17:13:44 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-10 18:18:49 +0200 |
| commit | ec26e687f442ecb24d5e356d5563c1ae3b469e52 (patch) | |
| tree | 338e0d1acfb569658a4cb20c80867f5f791e3c8d | |
| parent | 610c999e0c861960fe8989d95e1a2f1f9d06ae04 (diff) | |
| download | qt-creator-ec26e687f442ecb24d5e356d5563c1ae3b469e52.tar.gz | |
QmlDesigner.PropertyEditor: Allow centering and anchoring at the same time
With this patch center anchor and right/left/top/right anchors can
be used at the same time.
Task-number: QTCREATORBUG-11455
Change-Id: I3114eb76bdfc4226e78fd711e04849d7d7d7cd38
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml index ebc1cdae88..e42829f899 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml @@ -57,7 +57,8 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.verticalCentered = false; + if (anchorBackend.bottomAnchored) + anchorBackend.verticalCentered = false; anchorBackend.topAnchored = true; } else { anchorBackend.topAnchored = false; @@ -75,7 +76,8 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.verticalCentered = false; + if (anchorBackend.topAnchored) + anchorBackend.verticalCentered = false; anchorBackend.bottomAnchored = true; } else { anchorBackend.bottomAnchored = false; @@ -94,7 +96,8 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.horizontalCentered = false; + if (anchorBackend.rightAnchored) + anchorBackend.horizontalCentered = false; anchorBackend.leftAnchored = true; } else { anchorBackend.leftAnchored = false; @@ -112,7 +115,8 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.horizontalCentered = false; + if (anchorBackend.leftAnchored) + anchorBackend.horizontalCentered = false; anchorBackend.rightAnchored = true; } else { anchorBackend.rightAnchored = false; @@ -156,8 +160,10 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.topAnchored = false; - anchorBackend.bottomAnchored = false; + if (anchorBackend.topAnchored && anchorBackend.bottomAnchored) { + anchorBackend.topAnchored = false; + anchorBackend.bottomAnchored = false; + } anchorBackend.verticalCentered = true; } else { anchorBackend.verticalCentered = false; @@ -175,8 +181,10 @@ ButtonRow { onClicked: { if (checked) { - anchorBackend.leftAnchored = false; - anchorBackend.rightAnchored = false; + if (anchorBackend.leftAnchored && anchorBackend.rightAnchored) { + anchorBackend.leftAnchored = false; + anchorBackend.rightAnchored = false; + } anchorBackend.horizontalCentered = true; } else { anchorBackend.horizontalCentered = false; |