From a88fc5fa38df87cd9acdc2e5b006c4f5fff7943a Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 5 Sep 2019 16:01:41 +0200
Subject: QmlDesigner: Add loader resize logic to QtObjectPane
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2eb82e075203f82aa90edfe2eb44abc026d45adc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
---
 .../QtQuick/QtObjectPane.qml                       | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'share/qtcreator')

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
index 67e0cff45a..bf02e53803 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
@@ -104,7 +104,19 @@ Rectangle {
                 anchors.right: parent.right
                 frameVisible: false
 
+                id: tabView
+                height: Math.max(layoutSectionHeight, specficsHeight)
+
+                property int layoutSectionHeight: 400
+                property int specficsOneHeight: 0
+                property int specficsTwoHeight: 0
+
+                property int specficsHeight: Math.max(specficsOneHeight, specficsTwoHeight)
+
+                property int extraHeight: 40
+
                 Tab {
+                    id: tab
                     title: backendValues.className.value
 
                     component: Column {
@@ -125,6 +137,13 @@ Rectangle {
                                 active = false
                                 active = true
                             }
+
+                            property int loaderHeight: specificsTwo.item.height + tabView.extraHeight
+                            onLoaderHeightChanged: tabView.specficsTwoHeight = loaderHeight
+
+                            onLoaded: {
+                                tabView.specficsTwoHeight = loaderHeight
+                            }
                         }
 
                         Loader {
@@ -133,6 +152,13 @@ Rectangle {
 
                             id: specificsOne;
                             source: specificsUrl;
+
+                            property int loaderHeight: specificsOne.item.height + tabView.extraHeight
+                            onLoaderHeightChanged: tabView.specficsHeight = loaderHeight
+
+                            onLoaded: {
+                                tabView.specficsOneHeight = loaderHeight
+                            }
                         }
                     }
                 }
-- 
cgit v1.2.3