From 397e5f302247508806f0c8d23f63b05b6ac0aa18 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Mon, 28 Nov 2022 16:37:48 +0200 Subject: [PATCH] QmlDesigner: Prevent content lib scroll when context-menu is open Fixes: QDS-8441 Change-Id: Idfc3400fac43668d14cd5ff85cb42d745ef97dfe Reviewed-by: Miikka Heikkinen --- .../contentLibraryQmlSource/ContentLibraryMaterialsView.qml | 1 + .../contentLibraryQmlSource/ContentLibraryTexturesView.qml | 1 + 2 files changed, 2 insertions(+) diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml index 589e0250b5e..6a17a98a9d3 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 4e2854a48bf..a7e6d08b3f1 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