diff options
author | Sami Merila <sami.merila@nokia.com> | 2011-08-16 11:02:42 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2011-08-16 11:02:42 (GMT) |
commit | de12ff38f2be5362321aa8e79cfbfd9692e18ab0 (patch) | |
tree | 51f2d2742ef582c8f45f3251c0d41638e95aae95 /src | |
parent | 1dc0a2ccd645abd26b13fd67313a03bbc722a74d (diff) | |
download | Qt-de12ff38f2be5362321aa8e79cfbfd9692e18ab0.zip Qt-de12ff38f2be5362321aa8e79cfbfd9692e18ab0.tar.gz Qt-de12ff38f2be5362321aa8e79cfbfd9692e18ab0.tar.bz2 |
Disabled splitscreen translation still moves screen
Do not connect (or disconnect) signal cursorPositionChanged() to slot
translateInputWidget() if auto-translation of splitview is disabled.
Task-number: QTBUG-20813
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index c3d293b..d0dda83 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -474,7 +474,7 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget) if (!alwaysResize) { if (gv->scene()) { - if (gv->scene()->focusItem()) { + if (gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) { // Check if the widget contains cursorPositionChanged signal and disconnect from it. QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged())); int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1)); @@ -580,7 +580,7 @@ void QCoeFepInputContext::ensureFocusWidgetVisible(QWidget *widget) if (!moveWithinVisibleArea) { // Check if the widget contains cursorPositionChanged signal and connect to it. QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged())); - if (gv->scene() && gv->scene()->focusItem()) { + if (gv->scene() && gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) { int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1)); if (index != -1) connect(gv->scene()->focusItem()->toGraphicsObject(), SIGNAL(cursorPositionChanged()), this, SLOT(translateInputWidget())); |