From 79a41ec7a945686c4e237329759b25b41d908fc4 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 21 Sep 2023 11:17:19 +0200 Subject: [PATCH] QmlDesigner: Fix text editor widget stretch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QDS-10730 Change-Id: I4e46e53032378b0af7b63921eddb5b0b84670dc4 Reviewed-by: Henning Gründl Reviewed-by: Qt CI Patch Build Bot --- .../components/bindingeditor/abstracteditordialog.cpp | 3 ++- .../components/bindingeditor/actioneditordialog.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/bindingeditor/abstracteditordialog.cpp b/src/plugins/qmldesigner/components/bindingeditor/abstracteditordialog.cpp index 8ee7ef1b9ed..35b9c501745 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/abstracteditordialog.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/abstracteditordialog.cpp @@ -123,7 +123,8 @@ void AbstractEditorDialog::setupUIComponents() m_buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); m_verticalLayout->addLayout(m_comboBoxLayout); - m_verticalLayout->addWidget(m_editorWidget); + //editor widget has to stretch the most among the other siblings: + m_verticalLayout->addWidget(m_editorWidget, 10); m_verticalLayout->addWidget(m_buttonBox); this->resize(660, 240); diff --git a/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp b/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp index b5bb15c30cf..86824ac2656 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp @@ -399,6 +399,16 @@ void ActionEditorDialog::showControls(bool show) m_assignmentSourceItem->setVisible(show); if (m_assignmentSourceProperty) m_assignmentSourceProperty->setVisible(show); + + if (m_stackedLayout) + m_stackedLayout->setEnabled(show); + if (m_actionLayout) + m_actionLayout->setEnabled(show); + if (m_assignmentLayout) + m_assignmentLayout->setEnabled(show); + + if (m_comboBoxLayout) + m_comboBoxLayout->setEnabled(show); } void ActionEditorDialog::setMultiline(bool multiline)