From 45364d43279ddc409e9def2e65b07a5129a2e9e2 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Wed, 23 Feb 2022 16:40:28 +0200
Subject: [PATCH] QmlDesigner: Disable scrolling when context menu is open

Disable components and assets views scrolling when the context menu
is open.

Fixes: QDS-6317
Change-Id: Ibdbf29b14d0383fd2b876c655ccb17c35fdb6aff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
---
 share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml    | 2 +-
 share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
index f254a325508..9ec7d8fcf39 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
@@ -424,7 +424,7 @@ Item {
             width: parent.width
             height: parent.height - y
             clip: true
-            interactive: assetsView.verticalScrollBarVisible
+            interactive: assetsView.verticalScrollBarVisible && !contextMenu.opened
 
             Column {
                 Repeater {
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
index e43342d650d..bc0dc79ef25 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
@@ -246,6 +246,7 @@ Item {
             id: verticalScrollView
             anchors.fill: parent
             clip: true
+            interactive: !itemContextMenu.opened && !moduleContextMenu.opened
 
             onContentHeightChanged: {
                 var maxPosition = Math.max(contentHeight - verticalScrollView.height, 0)
@@ -362,6 +363,7 @@ Item {
                 width: 270
                 height: parent.height
                 clip: true
+                interactive: !itemContextMenu.opened && !moduleContextMenu.opened
 
                 onContentHeightChanged: {
                     var maxPosition = Math.max(contentHeight - horizontalScrollView.height, 0)