Add a new compressable event QEvent::UpdateSoftKeys.

Now that the softkey framework triggers updates on focus changed,
window activated, and action added/removed/changed the softkey bar
was updating many times resulting in flicker. Solve that by
introducing a new event type that is posted to the softkey framework.
Since we only need to update the softkeys once per event loop
iteration, the event is compressible in the event loop.

Reviewed-by: Alessandro Portale

1 files changed, 30 insertions, 22 deletions

diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index a7a5223..76fb378 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -139,32 +139,40 @@ void QSoftKeyManager::sendKeyEvent()
                                 new QKeyEvent(QEvent::KeyPress, keyToSend, Qt::NoModifier));
 }
 
-void QSoftKeyManager::updateSoftKeys(bool force)
+void QSoftKeyManager::updateSoftKeys()
 {
-    QList<QAction*> softKeys;
-    QWidget *source = QApplication::focusWidget();
-    do {
-        if (source) {
-            QList<QAction*> actions = source->actions();
-            for (int i = 0; i < actions.count(); ++i) {
-                if (actions.at(i)->softKeyRole() != QAction::NoSoftKey)
-                    softKeys.append(actions.at(i));
-            }
+    QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
+    QApplication::postEvent(QSoftKeyManager::instance(), event);
+}
 
-            QWidget *parent = source->parentWidget();
-            if (parent && softKeys.isEmpty())
-                source = parent;
-            else
-                break;
-        } else {
-            source = QApplication::activeWindow();
-        }
-    } while (source);
+bool QSoftKeyManager::event(QEvent *e)
+{
+    if (e->type() == QEvent::UpdateSoftKeys) {
+        QList<QAction*> softKeys;
+        QWidget *source = QApplication::focusWidget();
+        do {
+            if (source) {
+                QList<QAction*> actions = source->actions();
+                for (int i = 0; i < actions.count(); ++i) {
+                    if (actions.at(i)->softKeyRole() != QAction::NoSoftKey)
+                        softKeys.append(actions.at(i));
+                }
+
+                QWidget *parent = source->parentWidget();
+                if (parent && softKeys.isEmpty())
+                    source = parent;
+                else
+                    break;
+            } else {
+                source = QApplication::activeWindow();
+            }
+        } while (source);
 
-    if (force || (source != QSoftKeyManager::softKeySource)) {
-            QSoftKeyManager::softKeySource = source;
-            QSoftKeyManager::updateSoftKeys_sys(softKeys);
+        QSoftKeyManager::softKeySource = source;
+        QSoftKeyManager::updateSoftKeys_sys(softKeys);
+        return true;
     }
+    return false;
 }
 
 #ifdef Q_WS_S60