aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
diff options
context:
space:
mode:
Diffstat (limited to 'share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml')
-rw-r--r--share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml4
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml b/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
index ee1ea8132a4..ce95aa21983 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
@@ -55,6 +55,8 @@ Item {
property bool hasWhenCondition: false
+ property bool scrollViewActive: false
+
property Item dragParent
property int visualIndex: 0
@@ -89,7 +91,7 @@ Item {
DragHandler {
id: dragHandler
- enabled: !root.baseState && !root.extendedState
+ enabled: !root.baseState && !root.extendedState && !root.scrollViewActive
onGrabChanged: function (transition, point) {
if (transition === PointerDevice.GrabPassive
|| transition === PointerDevice.GrabExclusive)