diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-04-13 17:49:52 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-27 13:47:03 +0200 |
| commit | a150d1211f9ec49f963227452ee4818746b8c6ed (patch) | |
| tree | 42a0c2d2aa385fd4a558ad98610d0f851244cf7d /src/quick/items/qquicktextinput_p_p.h | |
| parent | 63240b55333d602df118f2a540174c8100576fd5 (diff) | |
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 <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 10 |
1 files changed, 2 insertions, 8 deletions
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) { |