aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
diff options
context:
space:
mode:
Diffstat (limited to 'share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml60
1 files changed, 58 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
index 2b97df0646..11f46d29c5 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
@@ -47,7 +47,7 @@ Section {
SecondColumnLayout {
ComboBox {
backendValue: backendValues.flickableDirection
- model: ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
+ model: ["AutoFlickDirection", "AutoFlickIfNeeded", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
Layout.fillWidth: true
scope: "Flickable"
}
@@ -63,7 +63,7 @@ Section {
SecondColumnLayout {
ComboBox {
backendValue: backendValues.boundsBehavior
- model: ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"]
+ model: ["StopAtBounds", "DragOverBounds", "OvershootBounds", "DragAndOvershootBounds"]
Layout.fillWidth: true
scope: "Flickable"
}
@@ -167,6 +167,23 @@ Section {
}
Label {
+ text: qsTr("Synchronous drag")
+ tooltip: qsTr("If set to true, then when the mouse or touchpoint moves far enough to begin dragging\n"
+ + "the content, the content will jump, such that the content pixel which was under the\n"
+ + "cursor or touchpoint when pressed remains under that point.")
+ }
+
+ SecondColumnLayout {
+ CheckBox {
+ Layout.fillWidth: true
+ backendValue: backendValues.synchronousDrag
+ text: backendValues.synchronousDrag.valueToString
+ }
+ ExpandingSpacer {
+ }
+ }
+
+ Label {
text: qsTr("Content size")
}
@@ -247,6 +264,45 @@ Section {
}
Label {
+ text: qsTr("Origin")
+ }
+
+ SecondColumnLayout {
+ Label {
+ text: "X"
+ width: root.labelWidth
+ }
+
+ SpinBox {
+ backendValue: backendValues.originX
+ minimumValue: -8000
+ maximumValue: 8000
+ implicitWidth: root.spinBoxWidth
+ Layout.fillWidth: true
+ }
+
+ Item {
+ width: 4
+ height: 4
+ }
+
+ Label {
+ text: "Y"
+ width: root.labelWidth
+ }
+
+ SpinBox {
+ backendValue: backendValues.originY
+ minimumValue: -8000
+ maximumValue: 8000
+ implicitWidth: root.spinBoxWidth
+ Layout.fillWidth: true
+ }
+ ExpandingSpacer {
+ }
+ }
+
+ Label {
text: qsTr("Margins")
}