diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml index 7a90e894136..50590efc1f1 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml @@ -32,40 +32,12 @@ Section { anchors.right: parent.right caption: qsTr("Flickable") + id: root + + property int spinBoxWidth: 62 + SectionLayout { - Label { - text: qsTr("Content size") - } - SecondColumnLayout { - - Label { - text: "W" - width: 12 - } - - SpinBox { - backendValue: backendValues.contentWidth - minimumValue: 0 - maximumValue: 8000 - } - - Label { - text: "H" - width: 12 - } - - SpinBox { - backendValue: backendValues.contentHeight - minimumValue: 0 - maximumValue: 8000 - - } - - ExpandingSpacer { - - } - } Label { text: qsTr("Flick direction") @@ -83,7 +55,7 @@ Section { Label { text: qsTr("Behavior") - tooltip: qsTr("Bounds behavior") + tooltip: qsTr("Determines whether the surface may be dragged beyond the Flickable's boundaries, or overshoot the Flickable's boundaries when flicked.") } SecondColumnLayout { @@ -96,6 +68,22 @@ Section { } + + Label { + text: qsTr("Movement") + tooltip: qsTr("Determines whether the flickable will give a feeling that the edges of the view are soft, rather than a hard physical boundary.") + } + + SecondColumnLayout { + ComboBox { + backendValue: backendValues.boundsMovement + model: ["FollowBoundsBehavior", "StopAtBounds"] + Layout.fillWidth: true + scope: "Flickable" + } + + } + Label { text:qsTr("Interactive") } @@ -143,5 +131,202 @@ Section { } } + Label { + text: qsTr("Press delay") + tooltip: qsTr("Holds the time to delay (ms) delivering a press to children of the Flickable.") + } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.pressDelay + minimumValue: 0 + maximumValue: 2000 + decimals: 0 + } + + ExpandingSpacer { + } + } + + Label { + text:qsTr("Pixel aligned") + } + + SecondColumnLayout { + CheckBox { + backendValue: backendValues.pixelAligned + tooltip: qsTr("Sets the alignment of contentX and contentY to pixels (true) or subpixels (false).") + } + + ExpandingSpacer { + } + } + + Label { + text: qsTr("Content size") + } + + SecondColumnLayout { + + Label { + text: "W" + width: 28 + } + + SpinBox { + backendValue: backendValues.contentWidth + minimumValue: 0 + maximumValue: 8000 + implicitWidth: root.spinBoxWidth + } + + Item { + width: 4 + height: 4 + } + + Label { + text: "H" + width: 28 + } + + SpinBox { + backendValue: backendValues.contentHeight + minimumValue: 0 + maximumValue: 8000 + implicitWidth: root.spinBoxWidth + + } + + ExpandingSpacer { + + } + } + + Label { + text: qsTr("Content") + } + + SecondColumnLayout { + + Label { + text: "X" + width: 28 + } + + SpinBox { + backendValue: backendValues.contentX + minimumValue: 0 + maximumValue: 8000 + implicitWidth: root.spinBoxWidth + } + + Item { + width: 4 + height: 4 + } + + Label { + text: "Y" + width: 28 + } + + SpinBox { + backendValue: backendValues.contentY + minimumValue: 0 + maximumValue: 8000 + implicitWidth: root.spinBoxWidth + + } + + ExpandingSpacer { + + } + } + + Label { + text: qsTr("Margins") + } + + SecondColumnLayout { + Layout.fillWidth: true + + Label { + text: "Top" + width: 28 + } + + SpinBox { + backendValue: backendValues.topMargin + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + implicitWidth: root.spinBoxWidth + } + + Item { + width: 4 + height: 4 + } + + Label { + text: "Bottom" + width: 28 + } + + SpinBox { + backendValue: backendValues.bottomMargin + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + implicitWidth: root.spinBoxWidth + } + ExpandingSpacer { + + } + } + + Label { + text: ("") + } + + SecondColumnLayout { + Layout.fillWidth: true + + Label { + text: "Left" + width: 28 + } + + SpinBox { + backendValue: backendValues.leftMargin + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + implicitWidth: root.spinBoxWidth + } + + Item { + width: 4 + height: 4 + } + + Label { + text: "Right" + width: 28 + } + + SpinBox { + backendValue: backendValues.rightMargin + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + implicitWidth: root.spinBoxWidth + } + ExpandingSpacer { + + } + } + } }