summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2022-11-28 16:37:48 +0200
committerMahmoud Badri <mahmoud.badri@qt.io>2022-11-28 15:42:45 +0000
commit397e5f302247508806f0c8d23f63b05b6ac0aa18 (patch)
treee5eed0d883c5ab3f16aea742d924c89bc1446b16
parent5b19c034ed28053e52988115464dd1897262955b (diff)
downloadqt-creator-397e5f302247508806f0c8d23f63b05b6ac0aa18.tar.gz
QmlDesigner: Prevent content lib scroll when context-menu is open
Fixes: QDS-8441 Change-Id: Idfc3400fac43668d14cd5ff85cb42d745ef97dfe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml1
-rw-r--r--share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml1
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
index 589e0250b5..6a17a98a9d 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
@@ -10,6 +10,7 @@ HelperWidgets.ScrollView {
id: root
clip: true
+ interactive: !ctxMenu.opened
readonly property int cellWidth: 100
readonly property int cellHeight: 120
diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
index 4e2854a48b..a7e6d08b3f 100644
--- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
+++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml
@@ -10,6 +10,7 @@ HelperWidgets.ScrollView {
id: root
clip: true
+ interactive: !ctxMenu.opened
readonly property int cellWidth: 100
readonly property int cellHeight: 100