From 7fc3bac762fafc3fd1407b54e70c0aec25afee15 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 20 Sep 2022 11:35:52 +0200
Subject: [PATCH] QmlDesigner: Disable scrolling if content does fit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is required on windows, because the other scrollbar seems
to be taken into account somehow.

Change-Id: I890faf7493c38df1f2f2f7fae011d4946f1b9c33
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
---
 share/qtcreator/qmldesigner/newstateseditor/Main.qml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/share/qtcreator/qmldesigner/newstateseditor/Main.qml b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
index 3b3162f322e..1d6f6910dd1 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/Main.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
@@ -520,6 +520,16 @@ Rectangle {
                     orientation: Qt.Vertical
                 }
 
+                flickableDirection: {
+                    if (frame.contentHeight <= scrollView.height)
+                        return Flickable.HorizontalFlick
+
+                    if (frame.contentWidth <= scrollView.width)
+                        return Flickable.VerticalFlick
+
+                    return Flickable.HorizontalAndVerticalFlick
+                }
+
                 Flickable {
                     id: frame
                     boundsMovement: Flickable.StopAtBounds