diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-05 16:33:56 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 16:21:35 +0100 |
commit | 39f9b5def185337b2087cadeb3e137dfbeb85fa4 (patch) | |
tree | bb401cd8846ad29ecfe0b5f4c4bcfe12c101c3c0 /src/quick | |
parent | be1534e5df82561842d1847f90f1cab9462e10ef (diff) |
Adapt to QInputPanel::inputDirection() API
Information moved from QGuiApplication into QInputPanel.
Change-Id: Idd80609f4b67bffae7222a1fa27918724ebf60f6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquicktext.cpp | 3 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 3 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 6948e8826f..e8eb555dde 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -56,6 +56,7 @@ #include <QtGui/qtextobject.h> #include <QtGui/qtextcursor.h> #include <QtGui/qguiapplication.h> +#include <QtGui/qinputpanel.h> #include <private/qdeclarativestyledtext_p.h> #include <QtQuick/private/qdeclarativepixmapcache_p.h> @@ -1365,7 +1366,7 @@ bool QQuickTextPrivate::setHAlign(QQuickText::HAlignment alignment, bool forceAl bool QQuickTextPrivate::determineHorizontalAlignment() { if (hAlignImplicit) { - bool alignToRight = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText; + bool alignToRight = text.isEmpty() ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft : rightToLeftText; return setHAlign(alignToRight ? QQuickText::AlignRight : QQuickText::AlignLeft); } return false; diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index eba85828bc..e971ef7b5e 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -556,7 +556,7 @@ bool QQuickTextEditPrivate::determineHorizontalAlignment() if (text.isEmpty()) { const QString preeditText = control->textCursor().block().layout()->preeditAreaText(); alignToRight = preeditText.isEmpty() - ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft + ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft : preeditText.isRightToLeft(); } else { alignToRight = rightToLeftText; diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 12f02d8374..0ef3cd66d3 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -478,7 +478,8 @@ bool QQuickTextInputPrivate::determineHorizontalAlignment() QString text = q_func()->text(); if (text.isEmpty()) text = m_textLayout.preeditAreaText(); - bool isRightToLeft = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft(); + bool isRightToLeft = text.isEmpty() ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + : text.isRightToLeft(); return setHAlign(isRightToLeft ? QQuickTextInput::AlignRight : QQuickTextInput::AlignLeft); } return false; diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 44df9f25e2..3f28c4aefd 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -383,7 +383,7 @@ public: Qt::LayoutDirection layoutDirection() const { if (m_layoutDirection == Qt::LayoutDirectionAuto) { if (m_text.isEmpty()) - return QGuiApplication::keyboardInputDirection(); + return qApp->inputPanel()->inputDirection(); return m_text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; } return m_layoutDirection; |