summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-03-10 13:54:45 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-03-10 13:54:45 (GMT)
commit3c3176f43f049e0c26e56f04881bd8047e731915 (patch)
treed8f9db57dd8f80928226d092ef3612d512f83e24 /src/gui/inputmethod
parent177f6ec7a92e6108491a040e714485d840a40c71 (diff)
downloadQt-3c3176f43f049e0c26e56f04881bd8047e731915.zip
Qt-3c3176f43f049e0c26e56f04881bd8047e731915.tar.gz
Qt-3c3176f43f049e0c26e56f04881bd8047e731915.tar.bz2
Background app visible after split view closed
When using an app with graphicsview + vertical scrollbar that has previously opened the splitview, when closing the keyboard, the application is not reset to the original geometry correctly. This is caused by invalid operation in the resetSplitView() method that does not resize the graphics view back to original size AND might even leave it with incorrect window state. Task-number: QTBUG-17937 Reviewed-by: Guoqing Zhang
Diffstat (limited to 'src/gui/inputmethod')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index af48a92..73aa982 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -405,16 +405,16 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget)
if (rootItem)
rootItem->resetTransform();
}
+ } else {
+ if (m_splitViewResizeBy)
+ gv->resize(gv->rect().width(), m_splitViewResizeBy);
}
-
// Resizing might have led to widget losing its original windowstate.
// Restore previous window state.
if (m_splitViewPreviousWindowStates != windowToMove->windowState())
windowToMove->setWindowState(m_splitViewPreviousWindowStates);
- if (m_splitViewResizeBy)
- gv->updateGeometry();
windowToMove->setUpdatesEnabled(true);
gv->setAttribute(Qt::WA_Resized, userResize); //not a user resize