From db34625eaef8eec373a0427f81e91a414dbd05da Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 4 Nov 2011 18:07:04 +1000 Subject: Fix QQuickTextInput implicit width. QQuickTextInput tries to set the UseDesignMetrics text option on its QLineControl but this is overridden by the options set in updateDisplayText(). Apply the new options in updateDisplayText to the existing options. Change-Id: I6789c3c2d6e496c1594d586bd075473983978f77 Reviewed-by: Martin Jones --- src/gui/text/qlinecontrol.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/text/qlinecontrol.cpp b/src/gui/text/qlinecontrol.cpp index 40452a94c2..438300d3bc 100644 --- a/src/gui/text/qlinecontrol.cpp +++ b/src/gui/text/qlinecontrol.cpp @@ -92,7 +92,7 @@ void QLineControl::updateDisplayText(bool forceUpdate) m_textLayout.setText(str); - QTextOption option; + QTextOption option = m_textLayout.textOption(); option.setTextDirection(m_layoutDirection); option.setFlags(QTextOption::IncludeTrailingSpaces); m_textLayout.setTextOption(option); @@ -297,6 +297,7 @@ void QLineControl::_q_deleteSelected() void QLineControl::init(const QString &txt) { m_text = txt; + updateDisplayText(); m_cursor = m_text.length(); } -- cgit v1.2.3