diff options
| author | Kevin Krammer <kevin.krammer.qnx@kdab.com> | 2012-03-23 16:35:33 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 12:40:19 (GMT) |
| commit | acbdd48f4401f2cc9b48eb3bd79d957b1c4e2949 (patch) | |
| tree | 1ba3d566175d22dd00f67d200e2c1ad0751b460a /src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp | |
| parent | 69a50ee68bb870b3ba0d95a35ab8b6bc4e1a461f (diff) | |
| download | Qt-acbdd48f4401f2cc9b48eb3bd79d957b1c4e2949.zip Qt-acbdd48f4401f2cc9b48eb3bd79d957b1c4e2949.tar.gz Qt-acbdd48f4401f2cc9b48eb3bd79d957b1c4e2949.tar.bz2 | |
Refactoring virtual keyboard class into non-singleton
Getting rid of the singleton gives us better control over when the
virtual keyboard handling class is instantiated and configured.
Also notify screens about keyboard height changes and let them
notify through QWindowSystemInterface instead of "guessing" the
screen in QQnxVirtualKeyboard.
Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1
Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp')
| -rw-r--r-- | src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp b/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp index 95a0441..5a87777 100644 --- a/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp +++ b/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp @@ -676,10 +676,13 @@ static bool imfAvailable() return s_imfReady; } -QBBInputContext::QBBInputContext(QObject* parent): +QT_BEGIN_NAMESPACE + +QBBInputContext::QBBInputContext(QBBVirtualKeyboard &keyboard, QObject* parent): QInputContext(parent), mLastCaretPos(0), - mIsComposing(false) + mIsComposing(false), + mVirtualKeyboard(keyboard) { #if defined(QBBINPUTCONTEXT_DEBUG) qDebug() << TAG; @@ -890,7 +893,7 @@ QString QBBInputContext::identifierName() QString QBBInputContext::language() { - return QBBVirtualKeyboard::instance().languageId(); + return mVirtualKeyboard.languageId(); } bool QBBInputContext::filterEvent( const QEvent *event ) @@ -1044,7 +1047,7 @@ bool QBBInputContext::hasSelectedText() bool QBBInputContext::dispatchRequestSoftwareInputPanel() { - QBBVirtualKeyboard::instance().showKeyboard(); + mVirtualKeyboard.showKeyboard(); #if defined(QBBINPUTCONTEXT_DEBUG) qDebug() << "QBB: requesting virtual keyboard"; #endif @@ -1065,7 +1068,7 @@ bool QBBInputContext::dispatchRequestSoftwareInputPanel() bool QBBInputContext::dispatchCloseSoftwareInputPanel() { - QBBVirtualKeyboard::instance().hideKeyboard(); + mVirtualKeyboard.hideKeyboard(); #if defined(QBBINPUTCONTEXT_DEBUG) qDebug() << "QBB: hiding virtual keyboard"; #endif @@ -1656,4 +1659,4 @@ int32_t QBBInputContext::onSetSelection(input_session_t* ic, int32_t start, int3 return 0; } - +QT_END_NAMESPACE |