aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTuomo Pelkonen <tuomo.pelkonen@qt.io>2021-03-16 12:08:58 +0200
committerTuomo Pelkonen <tuomo.pelkonen@qt.io>2021-03-16 10:16:23 +0000
commit85533cce0fc3dffc71a4833dc111471c69e3443e (patch)
tree6eac44d39bfa4d25c1343f6c9c3b80c0746a8878
parentf820164b1ab4edf0421ac2b222b51b1e12e5430c (diff)
QmlDesigner: Use correct font in Text-edit based in-place editor
Task-number: QDS-2306 Change-Id: I47d886f013692be717b4dffd29d66c711b0760cf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/texttool/textedititem.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/texttool/textedititem.cpp b/src/plugins/qmldesigner/components/texttool/textedititem.cpp
index d965c4b7fd5..e689fc4a571 100644
--- a/src/plugins/qmldesigner/components/texttool/textedititem.cpp
+++ b/src/plugins/qmldesigner/components/texttool/textedititem.cpp
@@ -70,15 +70,17 @@ void TextEditItem::setFormEditorItem(FormEditorItem *formEditorItem)
setGeometry(rect);
NodeMetaInfo metaInfo = m_formEditorItem->qmlItemNode().modelNode().metaInfo();
+ auto node = m_formEditorItem->qmlItemNode();
+ auto font = node.instanceValue("font").value<QFont>();
if (metaInfo.isValid() &&
(metaInfo.isSubclassOf("QtQuick.TextEdit")
|| metaInfo.isSubclassOf("QtQuick.Controls.TextArea"))) {
QSize maximumSize = rect.size().toSize();
+ textEdit()->setFont(font);
activateTextEdit(maximumSize);
} else {
auto lineEdit = TextEditItemWidget::lineEdit();
- auto node = m_formEditorItem->qmlItemNode();
- lineEdit->setFont(node.instanceValue("font").value<QFont>());
+ lineEdit->setFont(font);
activateLineEdit();
}