From a150d1211f9ec49f963227452ee4818746b8c6ed Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Fri, 13 Apr 2012 17:49:52 +0300 Subject: QQuickTextInput aligment to follow input method on neutral content Earlier input method was followed only on empty editor. This made inputting one space character with arabic to be visualized left to right. As related change arabic numbers are aligned right even though the flow goes left to right. Change-Id: I36448949569f6290faad69de14df424575d8b97e Reviewed-by: Joona Petrell --- src/quick/items/qquicktextinput_p_p.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/quick/items/qquicktextinput_p_p.h') diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index d952b27b6f..34aa0726d3 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -380,14 +380,8 @@ public: m_passwordEchoTimer.stop(); } - Qt::LayoutDirection layoutDirection() const { - if (m_layoutDirection == Qt::LayoutDirectionAuto) { - if (m_text.isEmpty()) - return qApp->inputMethod()->inputDirection(); - return m_text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; - } - return m_layoutDirection; - } + Qt::LayoutDirection textDirection() const; + Qt::LayoutDirection layoutDirection() const; void setLayoutDirection(Qt::LayoutDirection direction) { if (direction != m_layoutDirection) { -- cgit v1.2.3