From 18da8a264f9a155332940c9e7b416db0b0b5058d Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Thu, 23 Jun 2011 10:38:02 +0300
Subject: Splitview - Auto-translation rules changed

When using "splitview" (virtual keyboard with non-fullscreen
editing mode), it is currently auto-translating the cursor to the
center of the screen if possible.

It would be preferable, if the translation would only be minimal,
just enough for cursor to be visible. This makes scrolling of
input widget (i.e. large editor) easier to use, as text flows
naturally (row-by-row) and not in "jumps" like it used to do.

Additionally, limit the translation to the end of input widget
boundary.

Task-number: QTBUG-20034
Reviewed-by: Miikka Heikkinen
---
 src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 33 ++++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index fcb809c..07d68a4 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -901,20 +901,35 @@ void QCoeFepInputContext::translateInputWidget()
 
     m_transformation = (rootItem->transform().isTranslating()) ? QRectF(0,0, gv->width(), rootItem->transform().dy()) : QRectF();
 
-    // Do nothing if the cursor is visible in the splitview area.
-    if (splitViewRect.contains(cursorP.boundingRect()))
+    // Adjust cursor bounding rect to be lower, so that view translates if the cursor gets near
+    // the splitview border.
+    QRect cursorRect = cursorP.boundingRect().adjusted(0, cursor.height(), 0, cursor.height());
+    if (splitViewRect.contains(cursorRect))
         return;
 
-    // New Y position should be ideally at the center of the splitview area.
-    // If that would expose unpainted canvas, limit the tranformation to the visible scene bottom.
+    // New Y position should be ideally just above the keyboard.
+    // If that would expose unpainted canvas, limit the tranformation to the visible scene rect or
+    // to the focus item's shape/clip path.
 
-    const qreal maxY = gv->sceneRect().bottom() - splitViewRect.bottom() + m_transformation.height();
-    qreal dy = -(qMin(maxY, (cursor.bottom() - vkbRect.top() / 2)));
+    const QPainterPath path = gv->scene()->focusItem()->isClipped() ?
+        gv->scene()->focusItem()->clipPath() : gv->scene()->focusItem()->shape();
+    const qreal itemHeight = path.boundingRect().height();
 
-    // Do not allow transform above screen top.
-    if (m_transformation.height() + dy > 0) {
+    // Limit the maximum translation so that underlaying window content is not exposed.
+    qreal maxY = gv->sceneRect().bottom() - splitViewRect.bottom();
+    maxY = m_transformation.height() ? (qMin(itemHeight, maxY) + m_transformation.height()) : maxY;
+    if (maxY < 0)
+        maxY = 0;
+
+    // Translation should happen row-by-row, but initially it needs to ensure that cursor is visible.
+    const qreal translation = m_transformation.height() ?
+        cursor.height() : (cursorRect.bottom() - vkbRect.top());
+    const qreal dy = -(qMin(maxY, translation));
+
+    // Do not allow transform above screen top, nor beyond scenerect
+    if (m_transformation.height() + dy > 0 || gv->sceneRect().bottom() + m_transformation.height() < 0) {
         // If we already have some transformation, remove it.
-        if (m_transformation.height() < 0) {
+        if (m_transformation.height() < 0 || gv->sceneRect().bottom() + m_transformation.height() < 0) {
             rootItem->resetTransform();
             translateInputWidget();
         }
-- 
cgit v0.12


From a3f97ba985c80b147bcc902416304544f1d0ec58 Mon Sep 17 00:00:00 2001
From: mread <qt-info@nokia.com>
Date: Wed, 22 Jun 2011 11:39:23 +0100
Subject: QTBUG-17776, reporting terminated threads as not running on Symbian

On Symbian app shutdown all threads are terminated and their stack
memory is released, but there is no time for notification of exit of
these threads. So any attempt to access stack data in such a thread
from static data destruction will cause a crash.

This was happening with the XmlQuery thread. It was testing if the
thread was still running, and QThread thought it was because there was
no notification. So when the XmlQuery thread was asked to exit, and
QThread::exit tried to access a stack based QEventLoop, there was a
crash.

By adding a test if the thread has been terminated to
QThread::isRunning(), clients can now rely on this to know that it is
safe to call exit() on a thread. The existing code is made safe again.

Task-number: QTBUG-17776
Reviewed-by: Shane Kearns
---
 src/corelib/thread/qthread.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 2cdaca0..2f96920 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -431,6 +431,12 @@ bool QThread::isRunning() const
 {
     Q_D(const QThread);
     QMutexLocker locker(&d->mutex);
+#ifdef Q_OS_SYMBIAN
+    // app shutdown on Symbian can terminate threads and invalidate their stacks without notification,
+    // check the thread is still alive.
+    if (d->data->symbian_thread_handle.Handle() && d->data->symbian_thread_handle.ExitType() != EExitPending)
+        return false;
+#endif
     return d->running;
 }
 
-- 
cgit v0.12